From d17705193d41b0e7c49da3ec8f5667668bafe5da Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 16 十月 2025 11:10:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..c003c28 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
@@ -24,16 +24,21 @@
public interface ActivityMapper extends BaseMapper<Activity> {
/**
- * id鏌ユ壘瀹㈡埛榛戝悕鍗�
+ * id鏌ユ壘
* @param id
* @return
*/
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