From 8f2e045fcb56929dd1d47d5799d45f688e047c6a Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 16 八月 2023 19:12:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 model/serviceOrder.go         |    8 ++--
 docs/swagger.yaml             |   29 +++++++++-----
 docs/docs.go                  |   31 ++++++++++-----
 docs/swagger.json             |   31 ++++++++++-----
 model/request/serviceOrder.go |    3 +
 5 files changed, 64 insertions(+), 38 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 2bd1b36..1eecb37 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -12773,12 +12773,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "product": {
-                    "$ref": "#/definitions/model.Product"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
@@ -14473,9 +14474,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
+                },
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
@@ -17732,9 +17737,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
+                },
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
diff --git a/docs/swagger.json b/docs/swagger.json
index 87ad4ba..5a1c7c1 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -12761,12 +12761,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "product": {
-                    "$ref": "#/definitions/model.Product"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
@@ -14461,9 +14462,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
+                },
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
@@ -17720,9 +17725,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
+                },
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index d5ec2c9..2252a9b 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1806,11 +1806,12 @@
       problemDesc:
         description: 闂鎻忚堪
         type: string
-      product:
-        $ref: '#/definitions/model.Product'
-      productId:
-        description: 浜у搧id
-        type: integer
+      productName:
+        description: 浜у搧鍚嶇О
+        type: string
+      productTypeName:
+        description: 浜у搧鍒嗙被鍚嶇О
+        type: string
       realTime:
         description: 瀹為檯澶勭悊鏃堕棿
         type: string
@@ -2954,9 +2955,12 @@
       problemDesc:
         description: 闂鎻忚堪
         type: string
-      productId:
-        description: 浜у搧id
-        type: integer
+      productName:
+        description: 浜у搧鍚嶇О
+        type: string
+      productTypeName:
+        description: 浜у搧鍒嗙被鍚嶇О
+        type: string
       realTime:
         description: 瀹為檯澶勭悊鏃堕棿
         type: string
@@ -5183,9 +5187,12 @@
       problemDesc:
         description: 闂鎻忚堪
         type: string
-      productId:
-        description: 浜у搧id
-        type: integer
+      productName:
+        description: 浜у搧鍚嶇О
+        type: string
+      productTypeName:
+        description: 浜у搧鍒嗙被鍚嶇О
+        type: string
       realTime:
         description: 瀹為檯澶勭悊鏃堕棿
         type: string
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
diff --git a/model/serviceOrder.go b/model/serviceOrder.go
index eaa6a75..e399e81 100644
--- a/model/serviceOrder.go
+++ b/model/serviceOrder.go
@@ -21,10 +21,10 @@
 		ServiceContract      ServiceContract    `gorm:"foreignKey:ServiceContractId"`
 		SalesDetailsId       int                `gorm:"column:order_id;type:int;not null;default:0;comment:閿�鍞鍗昳d" json:"salesDetailsId"` // 閿�鍞槑缁唅d
 		SalesDetails         SalesDetails       `gorm:"foreignKey:SalesDetailsId"`
-		Subject              string             `gorm:"column:subject;type:varchar(255);not null;default:'';comment:涓婚" json:"subject"` // 涓婚
-		ProductId            int                `gorm:"column:product_id;type:int;not null;default:0;comment:浜у搧id" json:"productId"`    // 浜у搧id
-		Product              Product            `gorm:"foreignKey:ProductId"`
-		ServiceTypeId        int                `gorm:"column:service_type_id;type:int;not null;default:0;comment:鏈嶅姟鏂瑰紡id" json:"serviceTypeId"` // 鏈嶅姟鏂瑰紡id
+		Subject              string             `gorm:"column:subject;type:varchar(255);not null;default:'';comment:涓婚" json:"subject"`                       // 涓婚
+		ProductTypeName      string             `gorm:"column:product_type_name;type:varchar(255);not null;default:'';comment:浜у搧鍒嗙被鍚嶇О" json:"productTypeName"` // 浜у搧鍒嗙被鍚嶇О
+		ProductName          string             `gorm:"column:product_name;type:varchar(255);not null;default:'';comment:浜у搧鍚嶇О" json:"productName"`            // 浜у搧鍚嶇О
+		ServiceTypeId        int                `gorm:"column:service_type_id;type:int;not null;default:0;comment:鏈嶅姟鏂瑰紡id" json:"serviceTypeId"`               // 鏈嶅姟鏂瑰紡id
 		ServiceType          ServiceType        `gorm:"foreignKey:ServiceTypeId"`
 		ServiceManId         int                `gorm:"column:service_man_id;type:int;not null;default:0;comment:鏈嶅姟浜哄憳" json:"serviceManId"` // 鏈嶅姟浜哄憳
 		ContactId            int                `gorm:"linkman_id" json:"contactId"`                                                        // 鑱旂郴浜篿d

--
Gitblit v1.8.0