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

xiangpei

2024-07-04 626bb3aa189053a742cf04f66929f2a54fc9695c

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

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

    Result recordTime(Integer userId);
}