From 2fcf3c67e95c1b7c82a1c8ba1cf308ffed0a47b1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 四月 2021 14:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   21 +++++++++++++++++++++
 1 files changed, 21 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 06081ba..97e87f5 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
@@ -5,6 +5,7 @@
 import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
 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.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
@@ -113,6 +114,12 @@
      * @param type 1是志愿者 0 不是
      */
     R putUserIsVolunteer(String phone, int type);
+    /**
+     * 修改用户志愿者状态
+     * @param userId 用户ID
+     * @param type 1是志愿者 0 不是
+     */
+    R putUserIsVolunteerById(Long userId, int type);
     /**
      * 用户绑定社区、小区
      * @param loginUserInfoVO 社区小区数据
@@ -371,4 +378,18 @@
      * @return  新增结果
      */
     R addSysUser(ShopStoreVO storeVO);
+
+    /**
+     * 修改SysUser用户信息
+     * @param storeVO   请求参数
+     * @return  修改结果
+     */
+    R editSysUser(ShopStoreVO storeVO);
+
+    /**
+     * 修改用户小程序首页活动提示
+     * @param userEditTipsDTO  请求参数
+     * @return  修改结果
+     */
+    R editUserTips(SysUserEditTipsDTO userEditTipsDTO);
 }

--
Gitblit v1.7.1