From 5aeb61e49e9e518108fec4aeb6fdd460f21cdbfe Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 14 九月 2023 13:59:24 +0800
Subject: [PATCH] 解决冲突
---
docs/swagger.json | 86 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/docs/swagger.json b/docs/swagger.json
index ba4c8df..6700840 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -282,7 +282,7 @@
}
}
},
- "/api-wms/v1/warehouse/jobType": {
+ "/api-wms/v1/warehouse/operationType": {
"get": {
"produces": [
"application/json"
@@ -324,7 +324,7 @@
"data": {
"type": "array",
"items": {
- "$ref": "#/definitions/models.JobType"
+ "$ref": "#/definitions/models.OperationType"
}
}
}
@@ -349,7 +349,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.AddJobType"
+ "$ref": "#/definitions/request.AddOperationType"
}
}
],
@@ -363,7 +363,7 @@
}
}
},
- "/api-wms/v1/warehouse/jobType/{id}": {
+ "/api-wms/v1/warehouse/operationType/{id}": {
"put": {
"produces": [
"application/json"
@@ -379,7 +379,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.UpdateJobType"
+ "$ref": "#/definitions/request.UpdateOperationType"
}
},
{
@@ -572,7 +572,7 @@
}
},
"definitions": {
- "constvar.BaseJobType": {
+ "constvar.BaseOperationType": {
"type": "integer",
"enum": [
1,
@@ -580,14 +580,14 @@
3
],
"x-enum-comments": {
- "BaseJobTypeIncoming": "鏀惰揣",
- "BaseJobTypeInternal": "鍐呴儴璋冩嫧",
- "BaseJobTypeOutgoing": "浜よ揣"
+ "BaseOperationTypeIncoming": "鏀惰揣",
+ "BaseOperationTypeInternal": "鍐呴儴璋冩嫧",
+ "BaseOperationTypeOutgoing": "浜よ揣"
},
"x-enum-varnames": [
- "BaseJobTypeIncoming",
- "BaseJobTypeOutgoing",
- "BaseJobTypeInternal"
+ "BaseOperationTypeIncoming",
+ "BaseOperationTypeOutgoing",
+ "BaseOperationTypeInternal"
]
},
"constvar.ReservationMethod": {
@@ -682,18 +682,36 @@
}
}
},
- "models.JobType": {
+ "models.Location": {
+ "type": "object",
+ "properties": {
+ "createTime": {
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "name": {
+ "description": "浣嶇疆鍚嶇О",
+ "type": "string"
+ },
+ "updateTime": {
+ "type": "string"
+ }
+ }
+ },
+ "models.OperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -767,11 +785,11 @@
}
]
},
- "returnJobType": {
+ "returnOperationType": {
"description": "閫�璐х被鍨嬪悕绉�",
"type": "string"
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
@@ -793,24 +811,6 @@
"warehouseId": {
"description": "浠撳簱id",
"type": "integer"
- }
- }
- },
- "models.Location": {
- "type": "object",
- "properties": {
- "createTime": {
- "type": "string"
- },
- "id": {
- "type": "integer"
- },
- "name": {
- "description": "浣嶇疆鍚嶇О",
- "type": "string"
- },
- "updateTime": {
- "type": "string"
}
}
},
@@ -903,18 +903,18 @@
}
}
},
- "request.AddJobType": {
+ "request.AddOperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -961,7 +961,7 @@
}
]
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
@@ -1048,18 +1048,18 @@
}
}
},
- "request.UpdateJobType": {
+ "request.UpdateOperationType": {
"type": "object",
"properties": {
"ReservationDaysBeforePriority": {
"description": "鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ",
"type": "integer"
},
- "baseJobType": {
+ "baseOperationType": {
"description": "鍩虹浣滀笟绫诲瀷",
"allOf": [
{
- "$ref": "#/definitions/constvar.BaseJobType"
+ "$ref": "#/definitions/constvar.BaseOperationType"
}
]
},
@@ -1106,7 +1106,7 @@
}
]
},
- "returnJobTypeID": {
+ "returnOperationTypeID": {
"description": "閫�璐х被鍨婭D",
"type": "integer"
},
--
Gitblit v1.8.0