From f13912640b945a91b028e9f29d0c50e35c768b93 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 11 八月 2023 11:21:41 +0800 Subject: [PATCH] Merge branch 'master' into zq --- model/serviceContract.go | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/model/serviceContract.go b/model/serviceContract.go index ccdb08f..5eff55e 100644 --- a/model/serviceContract.go +++ b/model/serviceContract.go @@ -18,6 +18,7 @@ Number string `json:"number" gorm:"column:number;type:varchar(255);comment:鍚堝悓缂栧彿"` MemberId int `json:"memberId" gorm:"column:member_id;type:int;comment:璐熻矗浜篿d"` ContactId int `json:"contactId" gorm:"column:contact_id;type:int;comment:鑱旂郴浜篿d"` + Contact Contact `json:"contact" gorm:"foreignKey:ContactId"` SaleChanceId int `json:"saleChanceId" gorm:"column:sale_chance_id;type:int;comment:閿�鍞満浼歩d"` SaleChance SaleChance `json:"SaleChance" gorm:"foreignKey:SaleChanceId"` SalesDetailsId int `json:"salesDetailsId" gorm:"column:sales_details_id;type:int;comment:鍚堝悓璁㈠崟id"` @@ -115,7 +116,8 @@ Preload("Products"). Preload("Client"). Preload("ServiceContractType"). - Preload("ServiceContractStatus") + Preload("ServiceContractStatus"). + Preload("Contact") } return db -- Gitblit v1.8.0