From 12e09639dcbfa63b5a23cde8642b72829d4f3a3b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 10 八月 2023 11:42:31 +0800
Subject: [PATCH] Merge branch 'zq'

---
 docs/swagger.yaml |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 632c09c..058fde4 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1270,6 +1270,8 @@
     type: object
   model.ServiceContract:
     properties:
+      SaleChance:
+        $ref: '#/definitions/model.SaleChance'
       amountInvoiced:
         description: 宸插紑绁ㄩ噾棰�
         type: number
@@ -1283,8 +1285,6 @@
         type: integer
       contactId:
         type: integer
-      contractId:
-        type: integer
       endTime:
         type: string
       id:
@@ -1297,14 +1297,24 @@
         items:
           $ref: '#/definitions/model.Product'
         type: array
+      quotation:
+        $ref: '#/definitions/model.Quotation'
       quotationId:
         type: integer
       remark:
         type: string
       saleChanceId:
         type: integer
+      salesDetails:
+        $ref: '#/definitions/model.SalesDetails'
+      salesDetailsId:
+        type: integer
+      serviceContractStatus:
+        $ref: '#/definitions/model.ServiceContractStatus'
       serviceContractStatusId:
         type: integer
+      serviceContractType:
+        $ref: '#/definitions/model.ServiceContractType'
       serviceContractTypeId:
         type: integer
       serviceTimes:
@@ -2296,8 +2306,6 @@
         type: integer
       contactId:
         type: integer
-      contractId:
-        type: integer
       endTime:
         type: string
       memberId:
@@ -2313,6 +2321,8 @@
       remark:
         type: string
       saleChanceId:
+        type: integer
+      salesDetailsId:
         type: integer
       serviceTimes:
         type: integer
@@ -2746,6 +2756,13 @@
           type: integer
         type: array
     type: object
+  request.DeleteServiceContract:
+    properties:
+      ids:
+        items:
+          type: integer
+        type: array
+    type: object
   request.DeleteServiceFeeManage:
     properties:
       ids:
@@ -2765,13 +2782,6 @@
       userId:
         description: 鐢ㄦ埛ID
         type: string
-    type: object
-  request.DeleteserviceContract:
-    properties:
-      ids:
-        items:
-          type: integer
-        type: array
     type: object
   request.DownloadFile:
     properties:
@@ -4341,8 +4351,6 @@
         type: integer
       contactId:
         type: integer
-      contractId:
-        type: integer
       endTime:
         type: string
       id:
@@ -4360,6 +4368,8 @@
       remark:
         type: string
       saleChanceId:
+        type: integer
+      salesDetailsId:
         type: integer
       serviceTimes:
         type: integer
@@ -9980,7 +9990,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.DeleteserviceContract'
+          $ref: '#/definitions/request.DeleteServiceContract'
       produces:
       - application/json
       responses:
@@ -10012,7 +10022,7 @@
                 data:
                   $ref: '#/definitions/response.ServiceContractsResponse'
               type: object
-      summary: 鐢熸垚璁″垝鍒楄〃
+      summary: 鏈嶅姟鍚堝悓鍒楄〃
       tags:
       - ServiceContract
   /api/serviceContract/update:

--
Gitblit v1.8.0