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 | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index fbb345d..4d0f444 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1473,6 +1473,8 @@ type: object model.SalesRefund: properties: + Source: + $ref: '#/definitions/model.SalesReturn' amountTotal: description: 浠风◣鍚堣 type: number @@ -1628,6 +1630,10 @@ percent: description: 姣斾緥 type: number + principal: + allOf: + - $ref: '#/definitions/model.User' + description: 鏀舵璐熻矗浜篒D principalId: description: 鏀舵璐熻矗浜篒D type: integer @@ -2055,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 @@ -2068,6 +2080,12 @@ SalePrice: description: 閿�鍞环鏍� type: number + Specs: + description: 瑙勬牸 + type: string + Type: + description: 鍨嬪彿 + type: string Unit: type: string type: object @@ -5059,6 +5077,10 @@ percent: description: 姣斾緥 type: number + principal: + allOf: + - $ref: '#/definitions/model.User' + description: 鏀舵璐熻矗浜篒D principalId: description: 鏀舵璐熻矗浜篒D type: integer @@ -10877,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