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

xiangpei

2024-07-12 e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b

 src/main/java/com/ycl/jxkg/mapper/EducationResourceMapper.java

@@ -23,5 +23,5 @@

    List<EducationResourceVO> page(@Param("query") EducationResourceVO query);

    List<EducationResourceVO> byType(@Param("query") StudentOnlineVO query);
    List<EducationResourceVO> studentPage(@Param("query") EducationResourceVO query);
}