解决代码冲突

huanghongfa

2021-06-22 fb813866ece1c2b05dd9700e4ab54395bdb5710b

解决代码冲突

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

@@ -2075,6 +2075,7 @@
        }
        IPage<EventListVO> eventPageList = this.baseMapper.getScreenEventList(new Page(eventListDTO.getPageNum(),eventListDTO.getPageSize()),eventListDTO);
        return R.ok(eventPageList);
    }

    @Override
    public List<EventDetailsVO> getUnUploadEvent() {