From 00957f0c836b80d9052a6ccf673d3b454b646081 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 29 九月 2025 18:17:54 +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