Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 07fc18f77a9764bd47857e30d65abc03cc1e439c

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

@@ -54,7 +54,8 @@
        }else {
            wrapper.orderBy("io_time", false);
        }
        return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper));
        Page<AgvWrkMast> agvWrkMastPage = agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(agvWrkMastPage);
    }

    @RequestMapping(value = "/wrkMast/list/auth/dbList")