From 06c0b03df2955475fe39ff2a793a5f151f4da99f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 19:25:30 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 docs/docs.go |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 2bd1b36..b27e16a 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": "瀹為檯澶勭悊鏃堕棿",
@@ -12808,6 +12809,14 @@
                 "serviceContractId": {
                     "description": "鏈嶅姟鍚堝悓id",
                     "type": "integer"
+                },
+                "serviceMan": {
+                    "description": "鏈嶅姟浜哄憳",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.User"
+                        }
+                    ]
                 },
                 "serviceManId": {
                     "description": "鏈嶅姟浜哄憳",
@@ -14473,9 +14482,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
+                },
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",
@@ -17732,9 +17745,13 @@
                     "description": "闂鎻忚堪",
                     "type": "string"
                 },
-                "productId": {
-                    "description": "浜у搧id",
-                    "type": "integer"
+                "productName": {
+                    "description": "浜у搧鍚嶇О",
+                    "type": "string"
+                },
+                "productTypeName": {
+                    "description": "浜у搧鍒嗙被鍚嶇О",
+                    "type": "string"
                 },
                 "realTime": {
                     "description": "瀹為檯澶勭悊鏃堕棿",

--
Gitblit v1.8.0