Merge remote-tracking branch 'origin/master'

wangpengfei

2023-08-24 20f6ea1b89070f17b1d9f47e9c5e349f0c87c37d

 model/serviceContract.go

@@ -42,7 +42,7 @@
      AmountUnInvoiced        decimal.Decimal       `gorm:"column:amount_not_invoiced;type:decimal(12,2);comment:未开票金额" json:"amountUnInvoiced"` // 未开票金额
      AmountTotal             decimal.Decimal       `gorm:"column:amount_total;type:decimal(12,2);comment:价税合计" json:"amountTotal"`              // 价税合计
      Products                []*Product            `json:"products" gorm:"many2many:service_contract_product;"`
      gorm.Model              `json:"-"`
      CrmModel
   }

   ServiceContractSearch struct {
@@ -58,7 +58,7 @@
   }
)

func (ServiceContract) TableName() string {
func (slf *ServiceContract) TableName() string {
   return "service_contract"
}