Commit Graph

1422 Commits

Author SHA1 Message Date
yang
39e336d044 案例bug修复 2024-10-08 20:17:08 +08:00
nisen
b61923233a Merge branch 'zcwy0912-llf' 2024-09-30 11:52:29 +08:00
Wangxxz
effb45c6d0 加判断 2024-09-30 11:51:47 +08:00
nisen
95aa5f7abe Merge branch 'zcwy0912-llf' 2024-09-30 10:43:13 +08:00
zhaolongfei
3af3c2eedf 考试随机试题功能修改 2024-09-29 11:17:00 +08:00
yang
516225f52e 作业导出,案例类型处理代码回退版本 2024-09-27 22:38:35 +08:00
nisen
e3c060b8d9 Merge remote-tracking branch 'yx/zcwy0913-yang-case-prod' 2024-09-27 18:00:06 +08:00
nisen
72783fb1ac Merge remote-tracking branch 'yx/zcwy0923-wjwyyk-online-prod2' 2024-09-27 17:59:32 +08:00
nisen
f5f8fcee98 Merge branch 'zcwy0912-llf' into 104-master 2024-09-27 17:47:55 +08:00
yang
003d227ba3 案例萃取,案例榜单排序,定时任务 2024-09-27 17:07:24 +08:00
yang
e6bd808a3d 作业导出,删除注释代码 2024-09-27 16:46:50 +08:00
yang
b87eb65b3e Merge branch 'refs/heads/zcwy-0724-wjw-online-prod' into zcwy0923-wjwyyk-online2
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java
2024-09-27 16:07:55 +08:00
yang
28af48581e 作业导出,相关bug修复与补充
作业导出,计算时长

作业导出,分数设置

作业导出,最高分、与作业完成时间

作业导出,考试

作业导出,模糊搜索

作业导出,优化导包

在线导出

作业导出,token

作业导出,bug修复
2024-09-27 16:00:32 +08:00
zhaolongfei
57e04f46c0 试题管理模板修改 2024-09-27 14:22:51 +08:00
nisen
6a04082245 Merge remote-tracking branch '104/master' into 104-master 2024-09-18 11:00:56 +08:00
nisen
81a1a88eab Merge branch 'zcwy0912-llf' into 104-master 2024-09-18 11:00:13 +08:00
nisen
1dfdc9277d Merge branch 'zcwy-0913-yang-case' 2024-09-14 13:51:27 +08:00
yang
7c840d2bfc 案例萃取,案例标签 2024-09-14 13:49:22 +08:00
nisen
48e2adad7f Merge branch 'zcwy-0913-yang-case' 2024-09-14 13:26:46 +08:00
yang
e04735ee44 案例萃取,最佳时间 2024-09-14 13:25:02 +08:00
yang
c2de2a433b 案例萃取,类型修改 2024-09-14 13:15:21 +08:00
nisen
cb0e784d5e Merge branch 'zcwy-0913-yang-case' 2024-09-14 13:04:00 +08:00
yang
e6feea6dbf 案例萃取,类型修改 2024-09-14 12:52:37 +08:00
nisen
012f987de0 案例萃取,暂时注释代码 2024-09-14 12:33:31 +08:00
yang
3cbef3e3f7 案例萃取 2024-09-14 10:48:00 +08:00
zhaolongfei
2e2edbbf57 试题管理模板修改 2024-09-13 16:02:26 +08:00
zhaolongfei
beba553faa 试题管理模板修改 2024-09-13 15:08:45 +08:00
nisen
403e72ec5f Merge branch 'zcwy0815-llf' into 104-master
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
2024-09-12 18:35:31 +08:00
nisen
9136f338da Merge branch 'zcwy0912-llf' into 104-master 2024-09-12 18:32:59 +08:00
zhaolongfei
120a4f45fc 试题管理模板修改 2024-09-12 14:35:13 +08:00
lu
2c967cef0a 作业导出500 2024-09-10 17:10:48 +08:00
zhaolongfei
29a17efd44 多余代码删除 2024-09-10 15:32:54 +08:00
joshen
f8257a1806 Update application-pro.properties 2024-09-08 13:31:10 +08:00
joshen
2986344fd5 Update application-pro.properties 2024-09-08 13:29:40 +08:00
joshen
056d15e5fa Update application-pro.properties 2024-09-08 13:27:40 +08:00
joshen
d2043da062 Update application-pro.properties 2024-09-08 13:25:25 +08:00
nisen
af6c232d49 Merge remote-tracking branch '121/master' into 104-master 2024-09-05 15:00:02 +08:00
nisen
18bb8a434a Merge branch 'master-0705' into 121-master 2024-09-05 14:57:17 +08:00
nisen
aa32e9136c 104-master代碼回退 2024-09-05 11:09:43 +08:00
zhaolongfei
903a1369f5 多余代码删除 2024-09-04 16:48:12 +08:00
zhaolongfei
0fcd4568ec 802bug修复 2024-09-04 16:35:33 +08:00
lu
45fce7927d 作业导出修改名称 2024-09-03 11:21:37 +08:00
nisen
22ebe90c08 Merge branch 'zcwy-0724' 2024-09-02 11:47:58 +08:00
lu
5070be0620 作业导出确保目录存在 2024-09-02 11:39:05 +08:00
nisen
0dc58db106 Merge branch 'zcwy-0724'
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/IStudyService.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
2024-08-30 15:14:58 +08:00
nisen
749a6b69e7 Merge remote-tracking branch 'yx/code-review-0827-yang' 2024-08-29 19:00:20 +08:00
yang
6dadd80372 代码审计-spring 2024-08-29 16:48:54 +08:00
yang
04a4f528bf 代码审计-tomcat 2024-08-29 16:18:24 +08:00
nisen
4fa0215373 Merge branch 'shenji-0828-llf' into 104-master 2024-08-29 15:26:17 +08:00
yang
f7cd9f8469 代码审计-spring、snakeyaml 2024-08-29 15:15:05 +08:00