From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java
index 30896e9..b689e3b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java
@@ -3,14 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.sanshuo.IndexDateDTO;
-import com.panzhihua.common.model.dtos.user.IndexDataDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.sanshuo.ComEventArchiveVO;
import com.panzhihua.common.model.vos.sanshuo.ComEventConciliationVO;
-import com.panzhihua.common.model.vos.sanshuo.ComEventDetailVO;
import com.panzhihua.service_community.entity.ComEvent;
-import com.panzhihua.service_community.entity.SysUser;
import java.util.HashMap;
import java.util.List;
@@ -53,7 +50,7 @@
* @author manailin
* @date 2022-09-07 11:23:51
*/
- R<List<ComEvent>> pageByComEvent(ComEvent comEvent, Page pagination);
+ R<List<ComEvent>> pageByComEvent(ComEvent comEvent, Page pagination,LoginUserInfoVO loginUserInfoVO);
/**
* description 三说会堂事件表列表数据
@@ -63,7 +60,7 @@
* @author manailin
* @date 2022-09-07 11:23:51
*/
- List<ComEvent> listByComEvent(ComEvent comEvent);
+ List<ComEvent> listByComEvent(ComEvent comEvent,LoginUserInfoVO loginUserInfoVO);
/**
* description 修改三说会堂事件表状态
@@ -76,7 +73,7 @@
*/
R updateEnabled(Long id, Boolean enabled);
- R conciliationEvent(ComEventConciliationVO comEventConciliationVO);
+ R conciliationEvent(ComEventConciliationVO comEventConciliationVO, LoginUserInfoVO loginUserInfo);
R cancelRequest(Long id );
--
Gitblit v1.7.1