Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 d643b843cc794d8f59c4ecd04bda2b9d35e5b22a

 cloud-server-course/src/main/java/com/dsh/course/mapper/CancelledClassesMapper.java

@@ -20,7 +20,7 @@

public interface CancelledClassesMapper extends BaseMapper<CancelledClasses> {

    List<CancelClassesVO> listAll(@Param("query") CancelClassesQuery query,@Param("sTime")String sTime,@Param("eTime")String eTime);
    List<CancelClassesVO> listAll(@Param("query") CancelClassesQuery query, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("collect") List<Integer> collect);

    List<MoneyBack> getRefund();