From c5a0eb549cba2cd358a2d0496c44f3a289f15d9c Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 28 八月 2023 14:22:06 +0800
Subject: [PATCH] fix

---
 model/serviceOrder.go |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index 0da0631..e5a5f6e 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"`           // 涓婇棬鍦板潃
@@ -53,6 +54,7 @@
 		Solution             string             `gorm:"column:solution;type:varchar(255);not null;default:'';comment:瑙e喅鏂规硶" json:"solution"`              // 瑙e喅鏂规硶
 		SolutionRemark       string             `gorm:"column:solution_remark;type:varchar(255);not null;default:'';comment:鍐呴儴澶囨敞" json:"solutionRemark"` // 鍐呴儴澶囨敞
 		Remark               string             `gorm:"column:remark;type:varchar(255);not null;default:'';comment:澶囨敞" json:"remark"`                    // 澶囨敞
+		CrmModel
 	}
 
 	// ServiceOrderSearch 鏈嶅姟鍗曟悳绱㈡潯浠�
@@ -68,7 +70,7 @@
 	}
 )
 
-func (ServiceOrder) TableName() string {
+func (slf *ServiceOrder) TableName() string {
 	return "service_order"
 }
 
@@ -96,6 +98,7 @@
 			Preload("SalesDetails").
 			Preload("ServiceType").
 			Preload("Contact").
+			Preload("ServiceMan").
 			Preload("PriorityLevel").
 			Preload("SaleChance").
 			Preload("FaultType").

--
Gitblit v1.8.0