From 092a98a583c4fe822a3eb4c4dac086f84b16189c Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 26 九月 2025 17:58:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysActivityController.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysActivityController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysActivityController.java index 6272507..8a47196 100644 --- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysActivityController.java +++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysActivityController.java @@ -45,7 +45,7 @@ @ApiOperation(value = "获取热门活动分页列表") @PostMapping(value = "/pageList") public R<PageInfo<TSysActivity>> pageList(@RequestBody TSysActivityQuery query) { - return R.ok(sysActivityService.pageList(query)); + return R.ok(sysActivityService.pageListApp(query)); } /** -- Gitblit v1.7.1