From 4e6d6e7c8e4ca42e96528a71162f5e58e473f652 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 09:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/mapper/ActivityMapper.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..271f56b 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
@@ -36,6 +36,8 @@
IPage getPage(IPage page, @Param("query") ActivityQuery query);
+
+
IPage getMembers(IPage page, @Param("query") ActivityMembersQuery query);
List<MyActivityVo> getMyActivityList(@Param("query")MyActivityQuery query,@Param("userId") String userId);
@@ -48,6 +50,5 @@
int batchUpdateActivities(@Param("list") List<Activity> activityList);
-
-
+ IPage getCanReportPage(IPage page,@Param("query") ActivityQuery query);
}
--
Gitblit v1.8.0