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

李天宇

2024-09-12 e8650550ebd4d4cdff1426f17d4a14bc7908e992

 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 @@
    }




}