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/request/serviceOrder.go |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/model/request/serviceOrder.go b/model/request/serviceOrder.go
index 434121a..81b6677 100644
--- a/model/request/serviceOrder.go
+++ b/model/request/serviceOrder.go
@@ -7,10 +7,11 @@
 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
+	ServiceContractId    int     `gorm:"service_contract_id" json:"serviceContractId"`                                                           // 鍚堝悓id
+	SalesDetailsId       int     `gorm:"sales_details_id" json:"salesDetailsId"`                                                                 // 閿�鍞鍗昳d
 	Subject              string  `gorm:"subject" json:"subject"`                                                                                 // 涓婚
-	ProductId            int     `gorm:"product_id" json:"productId"`                                                                            // 浜у搧id
+	ProductTypeName      string  `json:"productTypeName"`                                                                                        // 浜у搧鍒嗙被鍚嶇О
+	ProductName          string  `json:"productName"`                                                                                            // 浜у搧鍚嶇О
 	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
@@ -40,7 +41,9 @@
 
 type GetServiceOrderList struct {
 	PageInfo
-	QueryClass  constvar.ServiceOrderQueryClass  `json:"queryClass" form:"queryClass"`
-	KeywordType constvar.ServiceOrderKeywordType `json:"keywordType" form:"keywordType"`
-	Keyword     string                           `json:"keyword" form:"keyword"`
+	QueryClass        constvar.ServiceOrderQueryClass  `json:"queryClass" form:"queryClass"`
+	KeywordType       constvar.ServiceOrderKeywordType `json:"keywordType" form:"keywordType"`
+	Keyword           string                           `json:"keyword" form:"keyword"`
+	ServiceContractId int                              `json:"serviceContractId" form:"serviceContractId"`
+	SalesDetailsId    int                              `json:"salesDetailsId" form:"salesDetailsId"`
 }

--
Gitblit v1.8.0