merge conflicts

jiangshuai

2023-12-08 27be7a2c517404e4622470edf7b83b13129220ff

 docs/swagger.json

@@ -1138,6 +1138,34 @@
                }
            }
        },
        "/api-wms/v1/operation/getOperationInfo/{id}": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "入库/出库"
                ],
                "summary": "入库/出库列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "id",
                        "name": "id",
                        "in": "path",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/util.Response"
                        }
                    }
                }
            }
        },
        "/api-wms/v1/operation/getSupplierList": {
            "get": {
                "produces": [
@@ -2696,7 +2724,7 @@
                5
            ],
            "x-enum-comments": {
                "OperationStatus_Cancel": "完成",
                "OperationStatus_Cancel": "取消",
                "OperationStatus_Draft": "草稿",
                "OperationStatus_Finish": "完成",
                "OperationStatus_Ready": "就绪",
@@ -3329,6 +3357,9 @@
                    "type": "string"
                },
                "receiverPhone": {
                    "type": "string"
                },
                "source": {
                    "type": "string"
                },
                "sourceNumber": {
@@ -4616,6 +4647,9 @@
                    "description": "单号",
                    "type": "string"
                },
                "operationId": {
                    "type": "integer"
                },
                "productId": {
                    "type": "string"
                },