Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 cloud-server-activity/src/main/java/com/dsh/activity/controller/BenefitVideoController.java

@@ -99,7 +99,7 @@
        // 通过分类Id和课程id 查询视频
        List<BenefitsVideos> result = bfvService.getBybIdAndcId(site.getBenefitsVideoClassificationId(), site.getCourseId());
        if (result.size() > 0) {
            return 500;
            return false;
        }
        if (site.getId() == null) {
            return bfvService.save(site);