Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

jiangshuai

2023-11-15 b13834f8c0b4a0fe9928cb07a721e6ec7df86ae1

 docs/docs.go

@@ -3938,6 +3938,10 @@
        "request.GetLocationList": {
            "type": "object",
            "properties": {
                "isScrapLocation": {
                    "description": "是否报废",
                    "type": "boolean"
                },
                "jointName": {
                    "description": "拼接名称",
                    "type": "string"