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

huanghongfa

2021-07-16 a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07

 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,7 @@
     */
    @PostMapping("listagreements")
    R listAgreements(@RequestParam("communityId")Long communityId);

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