From 27be7a2c517404e4622470edf7b83b13129220ff Mon Sep 17 00:00:00 2001 From: jiangshuai <291802688@qq.com> Date: 星期五, 08 十二月 2023 11:14:04 +0800 Subject: [PATCH] merge conflicts --- docs/swagger.yaml | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/docs/swagger.yaml b/docs/swagger.yaml index b481d9a..d136a20 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -180,7 +180,7 @@ - 5 type: integer x-enum-comments: - OperationStatus_Cancel: 瀹屾垚 + OperationStatus_Cancel: 鍙栨秷 OperationStatus_Draft: 鑽夌 OperationStatus_Finish: 瀹屾垚 OperationStatus_Ready: 灏辩华 @@ -635,6 +635,8 @@ receiverName: type: string receiverPhone: + type: string + source: type: string sourceNumber: description: 婧愬崟鍙� @@ -1519,6 +1521,8 @@ number: description: 鍗曞彿 type: string + operationId: + type: integer productId: type: string productName: @@ -2292,6 +2296,24 @@ summary: 鑾峰彇鐗╂祦鍏徃鍒楄〃 tags: - 鍏ュ簱/鍑哄簱 + /api-wms/v1/operation/getOperationInfo/{id}: + get: + parameters: + - description: id + in: path + name: id + required: true + type: string + produces: + - application/json + responses: + "200": + description: 鎴愬姛 + schema: + $ref: '#/definitions/util.Response' + summary: 鍏ュ簱/鍑哄簱鍒楄〃 + tags: + - 鍏ュ簱/鍑哄簱 /api-wms/v1/operation/getSupplierList: get: produces: -- Gitblit v1.8.0