From 4d61fe8d8755ff2166ce7ac6adaa16c5f917fd33 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期三, 18 十月 2023 16:28:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
---
docs/swagger.yaml | 6 ++++++
request/operation_type.go | 1 +
docs/docs.go | 10 ++++++++--
docs/swagger.json | 8 ++++++++
4 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 3f9e79b..b1cd031 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -2948,6 +2948,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -3512,6 +3516,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -3726,8 +3734,6 @@
Description: "",
InfoInstanceName: "swagger",
SwaggerTemplate: docTemplate,
- LeftDelim: "{{",
- RightDelim: "}}",
}
func init() {
diff --git a/docs/swagger.json b/docs/swagger.json
index ca450f4..ccf0c51 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -2936,6 +2936,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
@@ -3500,6 +3504,10 @@
"description": "浠撳簱鍚嶇О",
"type": "string"
},
+ "prefix": {
+ "description": "鍓嶇紑",
+ "type": "string"
+ },
"printLabel": {
"description": "鏄惁鎵撳嵃鏍囩",
"type": "boolean"
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 3ab260e..64383bf 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -740,6 +740,9 @@
name:
description: 浠撳簱鍚嶇О
type: string
+ prefix:
+ description: 鍓嶇紑
+ type: string
printLabel:
description: 鏄惁鎵撳嵃鏍囩
type: boolean
@@ -1132,6 +1135,9 @@
name:
description: 浠撳簱鍚嶇О
type: string
+ prefix:
+ description: 鍓嶇紑
+ type: string
printLabel:
description: 鏄惁鎵撳嵃鏍囩
type: boolean
diff --git a/request/operation_type.go b/request/operation_type.go
index 46eb893..a76c5d3 100644
--- a/request/operation_type.go
+++ b/request/operation_type.go
@@ -24,6 +24,7 @@
ShowOperations bool `json:"showOperations" gorm:"column:show_operations;type:int"` //鏄剧ず浣滀笟璇︽儏
CreateBackorder constvar.WhetherType `json:"createBackorder" gorm:"column:create_backorder"` //鍒涘缓娆犲崟
ReturnOperationTypeID int `json:"returnOperationTypeID" gorm:"column:return_job_type_id"` //閫�璐х被鍨婭D
+ Prefix string `json:"prefix" gorm:"type:varchar(255);comment:鍓嶇紑"` //鍓嶇紑
}
type UpdateOperationType struct {
--
Gitblit v1.8.0