Merge branch 'test' into 'master'

罗元桥

2021-07-24 cbf825f4e63e77241a11ec90841637991e43940f

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

@@ -85,7 +85,7 @@
                cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley()))), ArrayList::new));
                cascadeHouseVOList.forEach(cascade -> {
                    cascade.setName(cascade.getAlley());
                });
                    });
                break;
            case 2:
                if(houseDO != null){