Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-27 db9d95db6f25f95cbc614525adef7dbdeae6478c

 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);

    /**
@@ -771,4 +771,7 @@

    @PostMapping("user/getUserGrids")
    R getGridIsOk(@RequestParam("userId")Long userId);

    @GetMapping("getGridsMemberList")
    R getGridsMemberList(@RequestParam("communityId")Long communityId);
}