解决冲突，合并代码

jiangshuai

2023-11-20 597de080f7597e59eee571d43f8f90cb5ce86092

 docs/docs.go

@@ -3938,6 +3938,10 @@
        "request.GetLocationList": {
            "type": "object",
            "properties": {
                "isScrapLocation": {
                    "description": "是否报废",
                    "type": "boolean"
                },
                "jointName": {
                    "description": "拼接名称",
                    "type": "string"
@@ -4515,8 +4519,14 @@
                    "description": "源位置",
                    "type": "string"
                },
                "fromLocationId": {
                    "type": "integer"
                },
                "number": {
                    "description": "单号",
                    "type": "string"
                },
                "productId": {
                    "type": "string"
                },
                "productName": {
@@ -4531,9 +4541,16 @@
                    "description": "目标位置",
                    "type": "string"
                },
                "toLocationId": {
                    "type": "integer"
                },
                "unit": {
                    "description": "单位",
                    "type": "string"
                },
                "weight": {
                    "description": "重量",
                    "type": "number"
                }
            }
        },
@@ -4635,6 +4652,8 @@
   Description:      "",
   InfoInstanceName: "swagger",
   SwaggerTemplate:  docTemplate,
   LeftDelim:        "{{",
   RightDelim:       "}}",
}

func init() {