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

fuliqi

2024-07-05 4e4e7828493ebfb9313ec6a3acd3b649d103d3e3

 src/main/java/com/ycl/jxkg/service/EducationResourceService.java

@@ -29,7 +29,7 @@
     * @param query
     * @return
     */
    Result byType(StudentOnlineVO query);
    Result studentPage(EducationResourceVO query);

    /**
     * 学习类型list
@@ -37,4 +37,6 @@
     * @return
     */
    Result typeList();

    Result recordTime(Integer userId);
}