From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 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 d6feca4..3628f16 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,16 +3,21 @@
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.*;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
+import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -414,4 +419,43 @@
* @return
*/
R updateUserArchives(UpdateUserArchivesVO userArchivesVO);
+
+ /**
+ * 修改app用户密码
+ * @param userInfoAppDTO 请求参数
+ * @return 修改结果
+ */
+ R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO);
+
+ /**
+ * 添加网格员
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 结果
+ */
+ R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO);
+
+ /**
+ * 网格员管理
+ * @param memberRelationDTO 请求参数
+ * @return 网格员列表
+ */
+ R getGridMemberList(PageEventGridMemberRelationDTO memberRelationDTO);
+
+ /**
+ * 网格员编辑
+ * @param gridMemberDTO 请求参数
+ * @return 编辑结果
+ */
+ R editGridUser(EventGridMemberEditAdminDTO gridMemberDTO);
+
+ /**
+ * 网格员重置密码
+ * @param gridMemberDTO 请求参数
+ * @return 重置结果
+ */
+ R passResetUser(EventGridMemberPassResetDTO gridMemberDTO);
+
+ R deleteMembers(List<Long> Ids);
+
+ R gridMemberEditStatus(EventGridMemberEditStatusDTO gridMemberEditDTO);
}
--
Gitblit v1.7.1