From 3033ccf3878fae2c204df53be2a283f29f5853ed Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 10 十月 2025 18:17:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/TSysActivityService.java |    3 ++-
 1 files changed, 2 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 b0a6a77..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,7 +21,7 @@
      * @param query
      * @return
      */
-    PageInfo<TSysActivity> pageList(TSysActivityQuery query);
+    PageInfo<TSysActivityVO> pageList(TSysActivityQuery query);
     /**
      * 获取热门活动分页列表
      * @param query

--
Gitblit v1.7.1