Merge remote-tracking branch 'origin/master'

zhoushihao

2024-05-25 8db5b45c853fe5e49f2bca9047ea63e739cb8d79

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java

@@ -149,7 +149,7 @@
        }
    }

    @ApiOperation("获取工位显示图1")
    @ApiOperation("获取工位显示图2")
    @GetMapping("/getwo2")
    public ResponseEntity<Map<String, Object>> getw2o() {
        Map<String, Object> responseData = new HashMap<>();