Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-13 a225b159a5ea61c6fb0a46f5ff9d2e6862cd7706

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

@@ -47,4 +47,12 @@
     * @return
     */
    R listSaveVillage(List<ComMngVillageServeExcelVO> list, Long communityId);

    /**
     * 实有房屋编辑
     * @param villageId
     * @param comMngVillageVO
     * @return
     */
    R editVillage(Long villageId, ComMngVillageVO comMngVillageVO);
}