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

xiangpei

2024-07-09 126c774854a74f02e5deaee308a7688e0f171aaa

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

@@ -37,4 +37,6 @@
     * @return
     */
    Result typeList();

    Result recordTime(Integer userId);
}