From 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 17:14:19 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |    8 +++++++-
 1 files changed, 7 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 a72b16e..23da2ed 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
@@ -620,7 +620,7 @@
      * @param id
      * @return
      */
-    @DeleteMapping("common/data/special/delete")
+    @DeleteMapping("common/data/special/delete1")
     R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
 
     /**
@@ -768,4 +768,10 @@
      */
     @PostMapping("listagreements")
     R listAgreements(@RequestParam("communityId")Long communityId);
+
+    @PostMapping("user/getUserGrids")
+    R getGridIsOk(@RequestParam("userId")Long userId);
+
+    @GetMapping("getGridsMemberList")
+    R getGridsMemberList(@RequestParam("communityId")Long communityId);
 }

--
Gitblit v1.7.1