From d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 十月 2025 18:16:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TSysActivityService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysActivityService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysActivityService.java
index 61760ba..5b9e32c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysActivityService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TSysActivityService.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TSysActivity;
import com.ruoyi.system.query.TSysActivityQuery;
+import com.ruoyi.system.vo.TSysActivityVO;
/**
* <p>
@@ -20,5 +21,11 @@
* @param query
* @return
*/
- PageInfo<TSysActivity> pageList(TSysActivityQuery query);
+ PageInfo<TSysActivityVO> pageList(TSysActivityQuery query);
+ /**
+ * 获取热门活动分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TSysActivity> pageListApp(TSysActivityQuery query);
}
--
Gitblit v1.7.1