merge conflicts

jiangshuai

2023-12-08 27be7a2c517404e4622470edf7b83b13129220ff

 docs/swagger.yaml

@@ -180,7 +180,7 @@
    - 5
    type: integer
    x-enum-comments:
      OperationStatus_Cancel: 完成
      OperationStatus_Cancel: 取消
      OperationStatus_Draft: 草稿
      OperationStatus_Finish: 完成
      OperationStatus_Ready: 就绪
@@ -635,6 +635,8 @@
      receiverName:
        type: string
      receiverPhone:
        type: string
      source:
        type: string
      sourceNumber:
        description: 源单号
@@ -1519,6 +1521,8 @@
      number:
        description: 单号
        type: string
      operationId:
        type: integer
      productId:
        type: string
      productName:
@@ -2292,6 +2296,24 @@
      summary: 获取物流公司列表
      tags:
      - 入库/出库
  /api-wms/v1/operation/getOperationInfo/{id}:
    get:
      parameters:
      - description: id
        in: path
        name: id
        required: true
        type: string
      produces:
      - application/json
      responses:
        "200":
          description: 成功
          schema:
            $ref: '#/definitions/util.Response'
      summary: 入库/出库列表
      tags:
      - 入库/出库
  /api-wms/v1/operation/getSupplierList:
    get:
      produces: