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/serviceOrder.go |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index 92109e7..e5a5f6e 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -54,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 鏈嶅姟鍗曟悳绱㈡潯浠�
@@ -69,7 +70,7 @@
 	}
 )
 
-func (ServiceOrder) TableName() string {
+func (slf *ServiceOrder) TableName() string {
 	return "service_order"
 }
 

--
Gitblit v1.8.0