Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2022-12-13 f057850aac83d7b154b5b96592ec1c944ebdf375

 ycl-platform/src/main/java/com/ycl/service/resources/impl/VideoResourcesServiceImpl.java

@@ -26,7 +26,7 @@
    VideoResourcesMapper videoResourcesMapper;

    @Override
    public Page<MediaVO> selectImages(Integer type, String startTime, String endTime, Long size, Long current) {
    public Page<MediaVO> selectImages(String type, String startTime, String endTime, Long size, Long current) {
        Page<MediaVO> mediaVOPage = new Page<>();
        mediaVOPage.setCurrent(current);
        mediaVOPage.setSize(size);