From b92edf56e7e25440e7c46b967aa5373a7a8b25c2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 09:22:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 59403a8..81bd154 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -224,7 +224,7 @@
      * @return 人员详情
      */
     @PostMapping("detailuser")
-    R detailUser(@RequestParam("userId") Long userId);
+    R<LoginUserInfoVO> detailUser(@RequestParam("userId") Long userId);
 
     /**
      * 设置用户标签
@@ -348,6 +348,17 @@
      */
     @PostMapping("adduserbackstageproperty")
     R addUserBackstageProperty(@RequestBody AdministratorsUserVO administratorsUserVO);
+
+
+    /**
+     * 更新
+     *
+     * @param administratorsUserVO
+     *            编辑账户内容
+     * @return 编辑结果
+     */
+    @PostMapping("updateStreet")
+    R updateStreet(@RequestBody AdministratorsUserVO administratorsUserVO);
 
     /**
      * 编辑运营、社区后台账户
@@ -1180,4 +1191,11 @@
      */
     @PostMapping("/mcs/bindPhone")
     R bindOrAddMcsUser(@RequestBody @Valid BindUserPhoneDTO bindUserPhoneDTO);
+
+    /**
+     * 删除用户信息缓存
+     * @param phone
+     */
+    @DeleteMapping("/deleteUserCashByPhone")
+    R deleteUserCashByPhone(@RequestParam("phone") String phone);
 }

--
Gitblit v1.7.1