From 5053e0347804728c63c5498e0aa18129822454cb Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 30 八月 2023 13:31:46 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

---
 docs/swagger.yaml |   61 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a2fda8b..4d0f444 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1438,6 +1438,8 @@
         type: integer
       desc:
         type: string
+      detail_address:
+        type: string
       followRecord:
         items:
           $ref: '#/definitions/model.FollowRecord'
@@ -1471,6 +1473,8 @@
     type: object
   model.SalesRefund:
     properties:
+      Source:
+        $ref: '#/definitions/model.SalesReturn'
       amountTotal:
         description: 浠风◣鍚堣
         type: number
@@ -1626,6 +1630,10 @@
       percent:
         description: 姣斾緥
         type: number
+      principal:
+        allOf:
+        - $ref: '#/definitions/model.User'
+        description: 鏀舵璐熻矗浜篒D
       principalId:
         description: 鏀舵璐熻矗浜篒D
         type: integer
@@ -2053,10 +2061,16 @@
       MaterialMode:
         description: 鐗╂枡绫诲瀷
         type: string
+      MaxInventory:
+        description: 鏈�澶у簱瀛�
+        type: integer
       MinInventory:
         description: 瀹夊叏搴撳瓨
         type: integer
       Name:
+        type: string
+      Node:
+        description: 澶囨敞
         type: string
       Number:
         type: string
@@ -2066,6 +2080,12 @@
       SalePrice:
         description: 閿�鍞环鏍�
         type: number
+      Specs:
+        description: 瑙勬牸
+        type: string
+      Type:
+        description: 鍨嬪彿
+        type: string
       Unit:
         type: string
     type: object
@@ -2767,6 +2787,9 @@
       desc:
         description: 澶囨敞
         type: string
+      detail_address:
+        description: 璇︾粏鍦板潃
+        type: string
       member_id:
         description: 閿�鍞礋璐ｄ汉ID
         type: integer
@@ -2847,6 +2870,10 @@
       saleChanceId:
         type: integer
       salesDetailsId:
+        type: integer
+      serviceContractStatusId:
+        type: integer
+      serviceContractTypeId:
         type: integer
       serviceTimes:
         type: integer
@@ -3434,7 +3461,9 @@
         additionalProperties: true
         description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"name": "瀹㈡埛鍚嶇О",
           "phone": "鎵嬫満鍙风爜", "detail_address":"璇︾粏鍦板潃", "next_visit_time":"涓嬪洖鍥炶鏃ユ湡", "member_name":
-          "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆"}'
+          "閿�鍞礋璐ｄ汉", "client_status": "瀹㈡埛鐘舵��", "client_level": "閲嶈绾у埆","representative":
+          "娉曞畾浠ｈ〃浜�", "registration_time": "娉ㄥ唽鏃堕棿", "business_scope": "缁忚惀鑼冨洿", "remark":
+          "澶囨敞", "not_admin":"1:鎴戠殑瀹㈡埛; 2:admin瀹㈡埛"}'
         type: object
     type: object
   request.GetContactList:
@@ -4926,6 +4955,9 @@
       desc:
         description: 澶囨敞
         type: string
+      detail_address:
+        description: 璇︾粏鍦板潃
+        type: string
       id:
         type: integer
       member_id:
@@ -5045,6 +5077,10 @@
       percent:
         description: 姣斾緥
         type: number
+      principal:
+        allOf:
+        - $ref: '#/definitions/model.User'
+        description: 鏀舵璐熻矗浜篒D
       principalId:
         description: 鏀舵璐熻矗浜篒D
         type: integer
@@ -5091,6 +5127,10 @@
       saleChanceId:
         type: integer
       salesDetailsId:
+        type: integer
+      serviceContractStatusId:
+        type: integer
+      serviceContractTypeId:
         type: integer
       serviceTimes:
         type: integer
@@ -10859,10 +10899,23 @@
   /api/serviceCollectionPlan/list:
     get:
       parameters:
-      - description: 鏈嶅姟鍚堝悓id
-        in: query
-        name: serviceContractId
+      - in: query
+        name: sourceId
+        required: true
         type: integer
+      - enum:
+        - 1
+        - 2
+        in: query
+        name: sourceType
+        required: true
+        type: integer
+        x-enum-comments:
+          CollectionSourceTypeSaleDetails: 閿�鍞槑缁�
+          CollectionSourceTypeServiceContract: 鏈嶅姟鍚堝悓
+        x-enum-varnames:
+        - CollectionSourceTypeSaleDetails
+        - CollectionSourceTypeServiceContract
       produces:
       - application/json
       responses:

--
Gitblit v1.8.0