Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-19 75e4afe327894168f7d65e87b9fbf0fac4612db3

 cloud-server-activity/src/main/java/com/dsh/activity/mapper/BenefitsVideosMapper.java

@@ -28,5 +28,5 @@
     * @return
     */
    List<Map<String, Object>> queryBenefitsVideosList(@Param("uid") Integer uid, @Param("classificationId") Integer classificationId,
                                                      @Param("pageSize") Integer pageSize, @Param("pageNo") Integer pageNo);
                                                      @Param("ids") List<Integer> ids, @Param("pageSize") Integer pageSize, @Param("pageNo") Integer pageNo);
}