From 87cad05224d857ec0e113ae03b006d2a52ec3049 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 16 八月 2023 11:55:26 +0800
Subject: [PATCH] Merge branch 'zq'
---
model/request/serviceOrder.go | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/model/request/serviceOrder.go b/model/request/serviceOrder.go
index 434121a..244373b 100644
--- a/model/request/serviceOrder.go
+++ b/model/request/serviceOrder.go
@@ -7,8 +7,8 @@
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
ServiceTypeId int `gorm:"service_type_id" json:"serviceTypeId"` // 鏈嶅姟鏂瑰紡id
@@ -40,7 +40,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