Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java

@@ -36,6 +36,7 @@
        Page<PromotionVideo> page = this.lambdaQuery()
                .like(StringUtils.isNotBlank(query.getVideoName()), PromotionVideo::getVideoName,
                        query.getVideoName())
                .orderByDesc(PromotionVideo::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page);