Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

 src/main/java/com/zy/asrs/controller/WorkController.java

@@ -103,7 +103,7 @@
    @ManagerAuth(memo = "货物形态转换")
    public R turnOverOutStartPayment(@RequestBody EmptyPlateOutParam param) {
        workService.turnOverOutPayment(param, getUserId());
        return R.ok("货物形态已转为仓储");
        return R.ok("货物形态已转为"+param.getPayment$(param.getPayment()));
    }

    @RequestMapping("/empty/plate/in/start")