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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -122,6 +122,17 @@
    }

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

    /**
     * 分页查询人脸识别
     *
     * @param loginUserInfoVO 查询参数