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

fuliqi

2024-07-05 3179257af77acbc229fe873de7495e2d3f8dfb6e

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

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

    Result recordTime(Integer userId);
}