解决代码冲突

huanghongfa

2021-06-23 13ccebf29ce191cc97b1d584d4bf7aa6084ebce0

解决代码冲突

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -2185,6 +2185,7 @@
    public R specialPopulationList(PageEventSpecialPopulationDTO specialPopulationDTO){
        IPage<EventSpecialPopulationVO> specialPopulationVOIPage = this.baseMapper.specialPopulationList(new Page(specialPopulationDTO.getPageNum(),specialPopulationDTO.getPageSize()),specialPopulationDTO);
        return R.ok(specialPopulationVOIPage);
    }
        
    @Override
    public List<EventDetailsVO> getUnUploadEvent() {