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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -111,6 +111,15 @@
    R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);

    /**
     * 微心愿搜索社区团队人员列表
     * @param param 请求参数
     * @param communityId   社区id
     * @return  社区团队人员列表
     */
    @PostMapping("listactivitymanager2")
    R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);

    /**
     *分页查询人脸识别
     * @param loginUserInfoVO 查询参数
     * @return 分页集合
@@ -128,11 +137,11 @@

    /**
     *分页查询人口管理
     * @param loginUserInfoVO 查询参数
     * @param userInfoVO 查询参数
     * @return 分页数据
     */
    @PostMapping("pageuser")
    R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO);
    R pageUser(@RequestBody AppletUserInfoVO userInfoVO);

    /**
     * 查询所有人员标签
@@ -620,7 +629,7 @@
     * @param id
     * @return
     */
    @DeleteMapping("common/data/special/delete")
    @DeleteMapping("common/data/special/delete1")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id);

    /**
@@ -771,4 +780,15 @@

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

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

    /**
     * 根据用户id查询用户openid
     * @param userId    用户id
     * @return  openid
     */
    @GetMapping("getUserOpenId")
    R getUserOpenId(@RequestParam("userId")Long userId);
}