From 88bd75d93f86d3cf4f12e652d459da8bae71e545 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 15:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java b/framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java
index 102a5e2..5daea02 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java
@@ -3,8 +3,10 @@
 import cn.lili.base.Result;
 import cn.lili.modules.lmk.domain.entity.Activity;
 import cn.lili.modules.lmk.domain.form.ActivityForm;
+import cn.lili.modules.lmk.domain.form.ActivityReportForm;
 import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
 import cn.lili.modules.lmk.domain.query.ActivityQuery;
+import cn.lili.modules.lmk.domain.query.MyActivityQuery;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -54,6 +56,8 @@
      */
     Result detail(String id);
 
+    Result getCanReportPage(ActivityQuery query);
+
     /**
      * 鍒楄〃
      * @return
@@ -71,4 +75,6 @@
     Result activityChangeRecommend(ActivityForm form);
 
     Result activityMembersPage(ActivityMembersQuery query);
+
+
 }

--
Gitblit v1.8.0