From 597de080f7597e59eee571d43f8f90cb5ce86092 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期一, 20 十一月 2023 16:04:48 +0800
Subject: [PATCH] 解决冲突，合并代码
---
docs/docs.go | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 73253d7..fba7780 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -4519,8 +4519,14 @@
"description": "婧愪綅缃�",
"type": "string"
},
+ "fromLocationId": {
+ "type": "integer"
+ },
"number": {
"description": "鍗曞彿",
+ "type": "string"
+ },
+ "productId": {
"type": "string"
},
"productName": {
@@ -4535,9 +4541,16 @@
"description": "鐩爣浣嶇疆",
"type": "string"
},
+ "toLocationId": {
+ "type": "integer"
+ },
"unit": {
"description": "鍗曚綅",
"type": "string"
+ },
+ "weight": {
+ "description": "閲嶉噺",
+ "type": "number"
}
}
},
@@ -4639,6 +4652,8 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
+ LeftDelim: "{{",
+ RightDelim: "}}",
}
func init() {
--
Gitblit v1.8.0