Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 ecb2d404cd65158a78e1d0c0520ce0d3ab0cfdbd

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

@@ -116,7 +116,7 @@
                                () -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum()))),
                                ArrayList::new));
                    cascadeHouseVOList.forEach(cascade -> {
                        cascade.setName(cascade.getHouseNum());
                        cascade.setName(cascade.getHouseNum()+"("+cascade.getName()+")");
                    });
                }
                break;