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

xyh

2021-06-23 d01be9f1ec9a393818ea64deca3cbe7fa9372e08

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

@@ -5,6 +5,7 @@
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;
@@ -207,4 +208,6 @@
    R getScreenGirds(Long communityId);

    R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO);

    R pagePopulationListApp(PagePopulationListDTO populationListDTO);
}