From 0b3bcdad216e73b43dec04db4a4792efefef0e37 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 17 八月 2023 10:09:03 +0800
Subject: [PATCH] Merge branch 'zq'
---
model/serviceOrder.go | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index 0da0631..92109e7 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -27,6 +27,7 @@
ServiceTypeId int `gorm:"column:service_type_id;type:int;not null;default:0;comment:鏈嶅姟鏂瑰紡id" json:"serviceTypeId"` // 鏈嶅姟鏂瑰紡id
ServiceType ServiceType `gorm:"foreignKey:ServiceTypeId"`
ServiceManId int `gorm:"column:service_man_id;type:int;not null;default:0;comment:鏈嶅姟浜哄憳" json:"serviceManId"` // 鏈嶅姟浜哄憳
+ ServiceMan User `gorm:"foreignKey:ServiceManId" json:"serviceMan"` // 鏈嶅姟浜哄憳
ContactId int `gorm:"linkman_id" json:"contactId"` // 鑱旂郴浜篿d
Contact Contact `gorm:"foreignKey:ContactId"`
Address string `gorm:"column:address;type:varchar(255);not null;default:'';comment:涓婇棬鍦板潃" json:"address"` // 涓婇棬鍦板潃
@@ -96,6 +97,7 @@
Preload("SalesDetails").
Preload("ServiceType").
Preload("Contact").
+ Preload("ServiceMan").
Preload("PriorityLevel").
Preload("SaleChance").
Preload("FaultType").
--
Gitblit v1.8.0