From 33cb0eb308c1b62e25211600383371c31907025e Mon Sep 17 00:00:00 2001
From: yinbentan <yinbentan@live.com>
Date: 星期二, 16 七月 2024 20:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jialian' into jialian
---
docs/docs.go | 93 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 86 insertions(+), 7 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index da9fa40..f46a305 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1,5 +1,4 @@
-// Code generated by swaggo/swag. DO NOT EDIT.
-
+// Package docs Code generated by swaggo/swag. DO NOT EDIT
package docs
import "github.com/swaggo/swag"
@@ -2032,7 +2031,7 @@
"tags": [
"鍏ュ簱/鍑哄簱"
],
- "summary": "鍏ュ簱/鍑哄簱鍒楄〃",
+ "summary": "鎿嶄綔璇︽儏鎺ュ彛",
"parameters": [
{
"type": "string",
@@ -2040,13 +2039,32 @@
"name": "id",
"in": "path",
"required": true
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
}
],
"responses": {
"200": {
"description": "鎴愬姛",
"schema": {
- "$ref": "#/definitions/util.Response"
+ "allOf": [
+ {
+ "$ref": "#/definitions/util.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/models.Operation"
+ }
+ }
+ }
+ ]
}
}
}
@@ -2595,6 +2613,43 @@
"schema": {
"$ref": "#/definitions/request.UpdateDepartment"
}
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/util.Response"
+ }
+ }
+ }
+ }
+ },
+ "/api-wms/v1/other/saveProductImagesFromExcel": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "鍏朵粬"
+ ],
+ "summary": "浠巈xcel涓幏鍙栦骇鍝佸浘鐗囧苟淇濆瓨",
+ "parameters": [
+ {
+ "description": "灞炴�т俊鎭�",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/controllers.saveProductImagesFromExcelRequest"
+ }
+ },
+ {
+ "type": "string",
+ "description": "token",
+ "name": "Authorization",
+ "in": "header",
+ "required": true
}
],
"responses": {
@@ -4377,6 +4432,27 @@
"WhetherTypeAlways",
"ReservationNever"
]
+ },
+ "controllers.saveProductImagesFromExcelRequest": {
+ "type": "object",
+ "properties": {
+ "excelFilePath": {
+ "description": "excel璺緞 鐢╠ocker cp浼犲埌瀹瑰櫒閲�",
+ "type": "string"
+ },
+ "imageColumn": {
+ "description": "鍥剧墖鎵�鍦ㄥ垪鍚�",
+ "type": "string"
+ },
+ "productIdColumnIndex": {
+ "description": "浜у搧ID鏄鍑犲垪(浠�0寮�濮�)",
+ "type": "integer"
+ },
+ "sheetIndex": {
+ "description": "绗嚑涓猻heet",
+ "type": "integer"
+ }
+ }
},
"gorm.DeletedAt": {
"type": "object",
@@ -6315,9 +6391,9 @@
"description": "姣忛〉澶у皬",
"type": "integer"
},
- "warehouseCode": {
- "description": "浠撳簱缂╁啓",
- "type": "string"
+ "warehouseId": {
+ "description": "WarehouseCode string ` + "`" + `json:\"warehouseCode\"` + "`" + ` //浠撳簱缂╁啓",
+ "type": "integer"
}
}
},
@@ -6355,6 +6431,9 @@
"unit": {
"description": "鍗曚綅",
"type": "string"
+ },
+ "warehouseCode": {
+ "type": "string"
}
}
},
--
Gitblit v1.8.0