Merge remote-tracking branch 'origin/master'

fuliqi

2023-11-30 e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0

 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);