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.yaml |   74 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 5a1e9a2..eb93df2 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1,18 +1,18 @@
 definitions:
-  constvar.BaseJobType:
+  constvar.BaseOperationType:
     enum:
     - 1
     - 2
     - 3
     type: integer
     x-enum-comments:
-      BaseJobTypeIncoming: 鏀惰揣
-      BaseJobTypeInternal: 鍐呴儴璋冩嫧
-      BaseJobTypeOutgoing: 浜よ揣
+      BaseOperationTypeIncoming: 鏀惰揣
+      BaseOperationTypeInternal: 鍐呴儴璋冩嫧
+      BaseOperationTypeOutgoing: 浜よ揣
     x-enum-varnames:
-    - BaseJobTypeIncoming
-    - BaseJobTypeOutgoing
-    - BaseJobTypeInternal
+    - BaseOperationTypeIncoming
+    - BaseOperationTypeOutgoing
+    - BaseOperationTypeInternal
   constvar.ReservationMethod:
     enum:
     - 1
@@ -80,14 +80,26 @@
         description: 鎺掑簭
         type: integer
     type: object
-  models.JobType:
+  models.Location:
+    properties:
+      createTime:
+        type: string
+      id:
+        type: integer
+      name:
+        description: 浣嶇疆鍚嶇О
+        type: string
+      updateTime:
+        type: string
+    type: object
+  models.OperationType:
     properties:
       ReservationDaysBeforePriority:
         description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
         type: integer
-      baseJobType:
+      baseOperationType:
         allOf:
-        - $ref: '#/definitions/constvar.BaseJobType'
+        - $ref: '#/definitions/constvar.BaseOperationType'
         description: 鍩虹浣滀笟绫诲瀷
       company:
         allOf:
@@ -131,10 +143,10 @@
         allOf:
         - $ref: '#/definitions/constvar.ReservationMethod'
         description: 淇濈暀鏂瑰紡
-      returnJobType:
+      returnOperationType:
         description: 閫�璐х被鍨嬪悕绉�
         type: string
-      returnJobTypeID:
+      returnOperationTypeID:
         description: 閫�璐х被鍨婭D
         type: integer
       showOperations:
@@ -149,18 +161,6 @@
       warehouseId:
         description: 浠撳簱id
         type: integer
-    type: object
-  models.Location:
-    properties:
-      createTime:
-        type: string
-      id:
-        type: integer
-      name:
-        description: 浣嶇疆鍚嶇О
-        type: string
-      updateTime:
-        type: string
     type: object
   models.Warehouse:
     properties:
@@ -225,14 +225,14 @@
         description: 澶囨敞
         type: string
     type: object
-  request.AddJobType:
+  request.AddOperationType:
     properties:
       ReservationDaysBeforePriority:
         description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
         type: integer
-      baseJobType:
+      baseOperationType:
         allOf:
-        - $ref: '#/definitions/constvar.BaseJobType'
+        - $ref: '#/definitions/constvar.BaseOperationType'
         description: 鍩虹浣滀笟绫诲瀷
       companyId:
         description: 鍏徃id
@@ -262,7 +262,7 @@
         allOf:
         - $ref: '#/definitions/constvar.ReservationMethod'
         description: 淇濈暀鏂瑰紡
-      returnJobTypeID:
+      returnOperationTypeID:
         description: 閫�璐х被鍨婭D
         type: integer
       showOperations:
@@ -324,14 +324,14 @@
         description: 澶囨敞
         type: string
     type: object
-  request.UpdateJobType:
+  request.UpdateOperationType:
     properties:
       ReservationDaysBeforePriority:
         description: 鍦ㄤ紭鍏堢骇鐨勫墠鍑犲ぉ
         type: integer
-      baseJobType:
+      baseOperationType:
         allOf:
-        - $ref: '#/definitions/constvar.BaseJobType'
+        - $ref: '#/definitions/constvar.BaseOperationType'
         description: 鍩虹浣滀笟绫诲瀷
       companyId:
         description: 鍏徃id
@@ -361,7 +361,7 @@
         allOf:
         - $ref: '#/definitions/constvar.ReservationMethod'
         description: 淇濈暀鏂瑰紡
-      returnJobTypeID:
+      returnOperationTypeID:
         description: 閫�璐х被鍨婭D
         type: integer
       showOperations:
@@ -598,7 +598,7 @@
       summary: 缂栬緫鍏徃
       tags:
       - 鍏徃
-  /api-wms/v1/warehouse/jobType:
+  /api-wms/v1/warehouse/operationType:
     get:
       parameters:
       - in: query
@@ -623,7 +623,7 @@
             - properties:
                 data:
                   items:
-                    $ref: '#/definitions/models.JobType'
+                    $ref: '#/definitions/models.OperationType'
                   type: array
               type: object
       summary: 鏌ヨ浣滀笟绫诲瀷鍒楄〃
@@ -636,7 +636,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.AddJobType'
+          $ref: '#/definitions/request.AddOperationType'
       produces:
       - application/json
       responses:
@@ -647,7 +647,7 @@
       summary: 娣诲姞浣滀笟绫诲瀷
       tags:
       - 浣滀笟绫诲瀷
-  /api-wms/v1/warehouse/jobType/{id}:
+  /api-wms/v1/warehouse/operationType/{id}:
     delete:
       parameters:
       - description: 浣滀笟绫诲瀷id
@@ -672,7 +672,7 @@
         name: object
         required: true
         schema:
-          $ref: '#/definitions/request.UpdateJobType'
+          $ref: '#/definitions/request.UpdateOperationType'
       - description: 浣滀笟绫诲瀷id
         in: path
         name: id

--
Gitblit v1.8.0