From 1fdfb56613adca09a0ddf39289b41f96fa335a01 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 23 七月 2025 17:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java
index 06e725b..c895d2e 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java
@@ -31,9 +31,14 @@
     ActivityVO getById(String id);
 
     /**
-    *  鍒嗛〉
+    *  绠$悊绔垎椤�
     */
     IPage getPage(IPage page, @Param("query") ActivityQuery query);
+
+    /**
+     *  鍟嗗绔鍒嗛〉
+     */
+    IPage storeGetPage(IPage page, @Param("query") ActivityQuery query);
 
 
     IPage getMembers(IPage page, @Param("query") ActivityMembersQuery query);
@@ -48,6 +53,5 @@
     int batchUpdateActivities(@Param("list") List<Activity> activityList);
 
 
-
-
+    IPage getCanReportPage(IPage page,@Param("query")  ActivityQuery query);
 }

--
Gitblit v1.8.0