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

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

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