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

manailin

2021-06-30 cf2e6ce54f82c61606a01f816f7cac8b3a967809

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

@@ -5,7 +5,10 @@
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.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
@@ -214,4 +217,12 @@
    R getPopulationDetailApp(Long populationId);

    R getPopulationRepairByApp();

    R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO);

    R delGridPopulationAdmin(List<Long> ids);

    R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO);


}