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

whycq

2024-07-03 2ee70a38e4c832e3888b12d29ebf962456069cdb

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

@@ -55,7 +55,8 @@
                param.remove("update_time");
            }
        }
        return R.ok(manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class)));
        Page<ManLocDetl> page = manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class));
        return R.ok(page);
    }


@@ -110,4 +111,6 @@
    }




}