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/docs.go | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 1ea6fb1..d04b932 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1150,6 +1150,34 @@
}
}
},
+ "/api-wms/v1/operation/getOperationInfo/{id}": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏ュ簱/鍑哄簱"
+ ],
+ "summary": "鍏ュ簱/鍑哄簱鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "id",
+ "name": "id",
+ "in": "path",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
"/api-wms/v1/operation/getSupplierList": {
"get": {
"produces": [
@@ -2708,7 +2736,7 @@
5
],
"x-enum-comments": {
- "OperationStatus_Cancel": "瀹屾垚",
+ "OperationStatus_Cancel": "鍙栨秷",
"OperationStatus_Draft": "鑽夌",
"OperationStatus_Finish": "瀹屾垚",
"OperationStatus_Ready": "灏辩华",
@@ -3341,6 +3369,9 @@
"type": "string"
},
"receiverPhone": {
+ "type": "string"
+ },
+ "source": {
"type": "string"
},
"sourceNumber": {
@@ -4628,6 +4659,9 @@
"description": "鍗曞彿",
"type": "string"
},
+ "operationId": {
+ "type": "integer"
+ },
"productId": {
"type": "string"
},
@@ -4754,6 +4788,8 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
+ LeftDelim: "{{",
+ RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0