From 4447be59108bfaf2b0e7b43acc6ab1f236bdd875 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 11 八月 2023 17:29:30 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 model/request/serviceOrder.go |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/model/request/serviceOrder.go b/model/request/serviceOrder.go
index d4f2b3e..434121a 100644
--- a/model/request/serviceOrder.go
+++ b/model/request/serviceOrder.go
@@ -5,32 +5,32 @@
 )
 
 type AddServiceOrder struct {
-	ServiceNumber   string  `gorm:"service_number" json:"serviceNumber"`      // 鏈嶅姟鍗曠紪鍙�
-	ClientId        int     `gorm:"client_id" json:"clientId"`                // 瀹㈡埛id
-	ContractId      int     `gorm:"contract_id" json:"contractId"`            // 鍚堝悓id
-	OrderId         int     `gorm:"order_id" json:"orderId"`                  // 閿�鍞鍗昳d
-	Subject         string  `gorm:"subject" json:"subject"`                   // 涓婚
-	ProductId       int     `gorm:"product_id" json:"productId"`              // 浜у搧id
-	ServiceTypeId   int     `gorm:"service_type_id" json:"serviceTypeId"`     // 鏈嶅姟鏂瑰紡id
-	ServiceManId    int     `gorm:"service_man_id" json:"serviceManId"`       // 鏈嶅姟浜哄憳
-	ContactId       int     `gorm:"linkman_id" json:"contactId"`              // 鑱旂郴浜篿d
-	Address         string  `gorm:"address" json:"address"`                   // 涓婇棬鍦板潃
-	PriorityLevelId int     `gorm:"priority_level_id" json:"priorityLevelId"` // 浼樺厛绾у埆id
-	AppointmentTime string  `gorm:"appointment_time" json:"appointmentTime"`  // 棰勭害涓婇棬鏃堕棿
-	SaleChanceId    int     `gorm:"sale_leads" json:"saleChanceId"`           // 閿�鍞満浼歩d
-	FaultTypeId     int     `gorm:"severity_id" json:"faultTypeId"`           // 鏁呴殰绫诲埆id
-	SeverityId      int     `gorm:"severity_id" json:"severity"`              // 涓ラ噸绋嬪害id
-	Status          int     `gorm:"status" json:"status"`                     // 澶勭悊鐘舵��
-	ExpectTime      string  `gorm:"expect_time" json:"expectTime"`            // 甯屾湜澶勭悊鏃堕棿
-	RealTime        string  `gorm:"real_time" json:"realTime"`                // 瀹為檯澶勭悊鏃堕棿
-	CarFare         float64 `gorm:"car_fare" json:"carFare"`                  // 浜ら�氳垂
-	ChargeAmount    float64 `gorm:"charge_amount" json:"chargeAmount"`        // 鏀惰垂閲戦
-	TimeSpentId     int     `gorm:"time_spent_id" json:"timeSpentId"`         // 鑺辫垂鏃堕棿
-	FaqId           int     `gorm:"problem_id" json:"faqId"`                  // 甯歌闂id
-	ProblemDesc     string  `gorm:"problem_desc" json:"problemDesc"`          // 闂鎻忚堪
-	Solution        string  `gorm:"solution" json:"solution"`                 // 瑙e喅鏂规硶
-	SolutionRemark  string  `gorm:"solution_remark" json:"solutionRemark"`    // 鍐呴儴澶囨敞
-	Remark          string  `gorm:"remark" json:"remark"`                     // 澶囨敞
+	ServiceNumber        string  `gorm:"service_number" json:"serviceNumber"`                                                                    // 鏈嶅姟鍗曠紪鍙�
+	ClientId             int     `gorm:"client_id" json:"clientId"`                                                                              // 瀹㈡埛id
+	ContractId           int     `gorm:"contract_id" json:"contractId"`                                                                          // 鍚堝悓id
+	OrderId              int     `gorm:"order_id" json:"orderId"`                                                                                // 閿�鍞鍗昳d
+	Subject              string  `gorm:"subject" json:"subject"`                                                                                 // 涓婚
+	ProductId            int     `gorm:"product_id" json:"productId"`                                                                            // 浜у搧id
+	ServiceTypeId        int     `gorm:"service_type_id" json:"serviceTypeId"`                                                                   // 鏈嶅姟鏂瑰紡id
+	ServiceManId         int     `gorm:"service_man_id" json:"serviceManId"`                                                                     // 鏈嶅姟浜哄憳
+	ContactId            int     `gorm:"linkman_id" json:"contactId"`                                                                            // 鑱旂郴浜篿d
+	Address              string  `gorm:"address" json:"address"`                                                                                 // 涓婇棬鍦板潃
+	PriorityLevelId      int     `gorm:"priority_level_id" json:"priorityLevelId"`                                                               // 浼樺厛绾у埆id
+	AppointmentTime      string  `gorm:"appointment_time" json:"appointmentTime"`                                                                // 棰勭害涓婇棬鏃堕棿
+	SaleChanceId         int     `gorm:"sale_leads" json:"saleChanceId"`                                                                         // 閿�鍞満浼歩d
+	FaultTypeId          int     `gorm:"severity_id" json:"faultTypeId"`                                                                         // 鏁呴殰绫诲埆id
+	SeverityId           int     `gorm:"severity_id" json:"severity"`                                                                            // 涓ラ噸绋嬪害id
+	ServiceOrderStatusId int     `gorm:"column:service_order_status_id;type:int;not null;default:0;comment:鏈嶅姟鍗曠姸鎬乮d" json:"serviceOrderStatusId"` // 澶勭悊鐘舵��
+	ExpectTime           string  `gorm:"expect_time" json:"expectTime"`                                                                          // 甯屾湜澶勭悊鏃堕棿
+	RealTime             string  `gorm:"real_time" json:"realTime"`                                                                              // 瀹為檯澶勭悊鏃堕棿
+	CarFare              float64 `gorm:"car_fare" json:"carFare"`                                                                                // 浜ら�氳垂
+	ChargeAmount         float64 `gorm:"charge_amount" json:"chargeAmount"`                                                                      // 鏀惰垂閲戦
+	TimeSpentId          int     `gorm:"time_spent_id" json:"timeSpentId"`                                                                       // 鑺辫垂鏃堕棿
+	FaqId                int     `gorm:"problem_id" json:"faqId"`                                                                                // 甯歌闂id
+	ProblemDesc          string  `gorm:"problem_desc" json:"problemDesc"`                                                                        // 闂鎻忚堪
+	Solution             string  `gorm:"solution" json:"solution"`                                                                               // 瑙e喅鏂规硶
+	SolutionRemark       string  `gorm:"solution_remark" json:"solutionRemark"`                                                                  // 鍐呴儴澶囨敞
+	Remark               string  `gorm:"remark" json:"remark"`                                                                                   // 澶囨敞
 }
 
 type UpdateServiceOrder struct {

--
Gitblit v1.8.0