Merge branch 'test' into test_bak

101captain

2021-09-30 3f50420b42259a88f7e623b16c14b00f52071f4c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -275,9 +275,11 @@
        Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize());
        IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO);
        doPager.getRecords().forEach(data -> {
            if(data.getUserType()!=null){
            if (data.getUserType() != 1) {
                data.setReleaseName(data.getCommunityName());
            }
            }
        });
        return R.ok(doPager);
    }