From a7937b8fcaa98b9a5dd04a1b83f2c3c2b591d354 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 10 六月 2021 13:24:02 +0800
Subject: [PATCH] Merge branch 'test_elder_cedoo' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index c0fb384..0088aea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -3,10 +3,7 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -449,7 +446,7 @@
* @param gridMemberDTO 请求参数
* @return 编辑结果
*/
- R editGridUser(EventGridMemberAddDTO gridMemberDTO);
+ R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO);
/**
* 网格员重置密码
@@ -461,4 +458,6 @@
R deleteMembers(List<Long> Ids);
R gridMemberEditStatus(EventGridMemberEditStatusDTO gridMemberEditDTO);
+
+ R noTips(Long userId);
}
--
Gitblit v1.7.1