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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 ac7f14b..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
@@ -1,7 +1,6 @@
package cn.lili.modules.lmk.mapper;
import cn.lili.modules.lmk.domain.entity.Activity;
-import cn.lili.modules.lmk.domain.entity.CustomerBlack;
import cn.lili.modules.lmk.domain.query.*;
import cn.lili.modules.lmk.domain.vo.ActivityReportVO;
import cn.lili.modules.lmk.domain.vo.ActivityVO;
@@ -37,13 +36,11 @@
IPage getPage(IPage page, @Param("query") ActivityQuery query);
+
+
IPage getMembers(IPage page, @Param("query") ActivityMembersQuery query);
- List<MyActivityVo> getMyActivityList(@Param("query")MyActivityQuery query);
-
- int cancelActivity(String id);
-
- ActivityReportVO getActivityReport(@Param("query")ActivityReportQuery query);
+ List<MyActivityVo> getMyActivityList(@Param("query")MyActivityQuery query,@Param("userId") String userId);
/**
* 鎵归噺鏇存柊娲诲姩
@@ -51,4 +48,7 @@
* @return 鍙楀奖鍝嶇殑琛屾暟
*/
int batchUpdateActivities(@Param("list") List<Activity> activityList);
+
+
+ IPage getCanReportPage(IPage page,@Param("query") ActivityQuery query);
}
--
Gitblit v1.8.0