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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

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