From 165f5d0ce0ee16bdce2b8af55ce4aa6383af6382 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 17:34:08 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   16 ++++++++++++++++
 1 files changed, 16 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..6a5ec01 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,12 @@
 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.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;
@@ -414,4 +416,18 @@
      * @return
      */
     R updateUserArchives(UpdateUserArchivesVO userArchivesVO);
+
+    /**
+     * 修改app用户密码
+     * @param userInfoAppDTO    请求参数
+     * @return  修改结果
+     */
+    R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO);
+
+    /**
+     * 添加网格员
+     * @param eventGridMemberAddDTO    请求参数
+     * @return  结果
+     */
+    R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO);
 }

--
Gitblit v1.7.1