合并代码，解决冲突

zhangchao

2024-11-04 c28e6101a5e42a9cdcc51ef6b69599ea15fe2af9

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

@@ -124,7 +124,7 @@
    }

    @RequestMapping("/locDdetl/adjust/start")
    @ManagerAuth(memo = "库存调整")
    @ManagerAuth(memo = "库存调整1")
    public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
        workService.adjustLocDetl(param, getUserId());
        return R.ok("库存调整成功");