Merge branch 'dev'

101captain

2022-03-23 2d0487d82ff61219c71155699b52d8d339a2443a

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -634,9 +634,9 @@
     * @return 查询结果
     */
    @GetMapping("usercertification")
    R userCertification(@RequestParam("id") Long id) {
    R userCertification(@RequestParam("id") Long id,@RequestParam("communityId")Long communityId) {
        List<ComPbMemberDO> comPbMemberDOList =
            comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id));
            comPbMemberService.list(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getUserId, id).eq(ComPbMemberDO::getCommunityId,communityId));
        List<PartyBuildingMemberVO> partyBuildingMemberVOList = new ArrayList<>();
        comPbMemberDOList.forEach(comPbMemberDO -> {
            PartyBuildingMemberVO partyBuildingMemberVO = new PartyBuildingMemberVO();