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

mitao

2025-04-11 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9

 cloud-server-activity/src/main/java/com/dsh/activity/service/BenefitsVideosService.java

@@ -63,7 +63,7 @@
    void receiveAward(Integer uid, Integer id) throws Exception;


    List<BenefitsVideos> getBenefitVideoById(Integer id);
    List<BenefitsVideos> getBenefitVideoById(Integer id, Integer state);

    List<BenefitsVideos> getBybIdAndcId(Integer benefitsVideoClassificationId, Integer courseId);
}