From 40d3bb9fe638a0bd79e829e7fd5114871101390b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 20 十一月 2025 10:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/lmk/service/ActivityService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 5daea02..45c9204 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
@@ -4,6 +4,7 @@
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.ActivityAuditRecordQuery;
import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
@@ -14,19 +15,21 @@
public interface ActivityService extends IService<Activity> {
+
+
/**
* 娣诲姞
* @param form
* @return
*/
- Result add(ActivityForm form);
+ Result add(ActivityForm form,Boolean isManager);
/**
* 淇敼
* @param form
* @return
*/
- Result update(ActivityForm form);
+ Result update(ActivityForm form,Boolean isManager);
/**
* 鎵归噺鍒犻櫎
@@ -50,6 +53,13 @@
Result page(ActivityQuery query);
/**
+ * 鏇村叿鐢ㄦ埛id鑾峰緱鐢宠鐨勬椿鍔ㄥ垎椤�
+ * @param query
+ * @return
+ */
+ Result getMyApplyActivityPage(ActivityQuery query);
+
+ /**
* 鏍规嵁id鏌ユ壘
* @param id
* @return
--
Gitblit v1.8.0