代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java

@@ -490,6 +490,4 @@
    R relationVillage(String name);

    R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO);

    void addPopuCommunity();
}