From 156d873f4878d62bac8b898b587636f3db8f77da Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 16 八月 2023 16:53:28 +0800
Subject: [PATCH] Merge branch 'zq'

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

diff --git a/model/request/serviceOrder.go b/model/request/serviceOrder.go
index 244373b..81b6677 100644
--- a/model/request/serviceOrder.go
+++ b/model/request/serviceOrder.go
@@ -10,7 +10,8 @@
 	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

--
Gitblit v1.8.0