From 20f6ea1b89070f17b1d9f47e9c5e349f0c87c37d Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期四, 24 八月 2023 11:03:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- model/serviceContract.go | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model/serviceContract.go b/model/serviceContract.go index 9d253af..d4b8744 100644 --- a/model/serviceContract.go +++ b/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" } -- Gitblit v1.8.0