代码合并冲突解决

huanghongfa

2021-08-30 35b9817b1b104a30ff95f54a494678af9badaa16

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMajorPopulationApi.java

@@ -13,4 +13,3 @@
public class ComMajorPopulationApi {

}