解决代码被合并后删除问题

huanghongfa

2021-06-28 1a054c486c9037b7cb0bca5c4472c628d1d1c36c

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

@@ -4,6 +4,8 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
@@ -76,7 +78,6 @@
     * @return 导入结果
     */
    R listSavePopulationConfirm(List<ComMngPopulationServeExcelVO> list, Long communityId);

    /**
     * 根据实有人口id修改用户标签
     *
@@ -176,7 +177,7 @@
     * @return  统计结果
     */
    R getScreenCivil(Long communityId);
	

   /**
     * description 根据身份证信息修改用户标签信息
     *
@@ -205,4 +206,12 @@
    R screenStatistic(Long communityId);

    R getScreenGirds(Long communityId);

    R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO);

    R pagePopulationListApp(PagePopulationListDTO populationListDTO);

    R getPopulationDetailApp(Long populationId);

    R getPopulationRepairByApp();
}