From a484168b903a919b24d65a5d95dea88a04d8f34c Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 26 十二月 2024 13:50:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs --- src/main/java/com/zy/asrs/controller/MatController.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java index 53e9135..68069f7 100644 --- a/src/main/java/com/zy/asrs/controller/MatController.java +++ b/src/main/java/com/zy/asrs/controller/MatController.java @@ -330,5 +330,15 @@ return R.ok().add(valueVos); } + @RequestMapping(value = "/mat/list/pda/page/auth") + @ManagerAuth + public R pdaPageList(@RequestParam(required = true)Long tagId, + @RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit){ + EntityWrapper<Mat> wrapper = new EntityWrapper<>(); +// wrapper.eq("tag_id", tagId); + wrapper.orderBy("create_time", false); + return R.ok().add(matService.selectPage(new Page<>(curr, limit), wrapper)); + } } -- Gitblit v1.9.1