hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 02:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,140 Commits 90 Branches 1 Tag
85eb11c30a9535971083ac6d5ae15f741eb157a3
Commit Graph

1140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhaolongfei
85eb11c30a Merge branch 'zcwy0525-llf' into dev0525 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
 2024-05-29 11:31:16 +08:00
zhaolongfei
8791256413 修改 2024-05-29 11:29:49 +08:00
zhaolongfei
309a6732bc 修改 2024-05-29 11:28:38 +08:00
zhaolongfei
5f223d9183 Merge branch 'zcwy0525-llf' into dev0525 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyAssessApi.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java
 2024-05-29 11:25:40 +08:00
zhaolongfei
0f882deca9 修改 2024-05-29 10:01:05 +08:00
zhaolongfei
b74141a036 修改 2024-05-29 09:58:28 +08:00
zhaolongfei
a090325202 修改 2024-05-28 19:58:44 +08:00
zhaolongfei
c7841adcaa 修改考试 2024-05-28 19:49:43 +08:00
zhaolongfei
9f0a926841 修改评估 2024-05-28 19:30:35 +08:00
zhaolongfei
dc3e47ec15 修改评估 2024-05-28 19:21:24 +08:00
zhaolongfei
3acf58e8d4 修改评估 2024-05-28 19:12:51 +08:00
zhaolongfei
2ff595062c 修改考试 2024-05-28 18:55:00 +08:00
zhaolongfei
0b3c6b057e Merge branch 'zcwy0525-llf' into dev0525 2024-05-28 18:47:19 +08:00
zhaolongfei
36fd3628bb 修改考试 2024-05-28 18:46:43 +08:00
zhaolongfei
56866a51df 修改考试 2024-05-28 18:45:35 +08:00
zhaolongfei
c1e45afbca Merge branch 'zcwy0525-llf' into dev0525 2024-05-28 18:30:38 +08:00
zhaolongfei
33b0057c5e 修改考试 2024-05-28 18:28:08 +08:00
zhaolongfei
219b406e8a Merge branch 'zcwy0525-llf' into dev0525 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
 2024-05-28 18:14:51 +08:00
zhaolongfei
de0ff38302 修改考试 2024-05-28 18:13:54 +08:00
zhaolongfei
06d14582cc 修改考试 2024-05-28 18:12:46 +08:00
zhaolongfei
08763593cd 修改考试 2024-05-28 17:41:07 +08:00
zhaolongfei
5f1f3ebf9f Merge branch 'zcwy0525-llf' into dev0525 2024-05-28 16:28:51 +08:00
zhaolongfei
8c283bc976 考试添加状态同步 2024-05-28 16:27:48 +08:00
zhaolongfei
c66c6369c6 配置文件修改 2024-05-28 16:11:18 +08:00
zhaolongfei
402015f5b1 配置文件修改 2024-05-28 15:49:13 +08:00
zhaolongfei
f61c7ed83f Merge branch 'zcwy0525-llf' into dev0525 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/dao/StudyCourseDao.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
#	servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
 2024-05-28 15:41:32 +08:00
zhaolongfei
3803babc76 修改 2024-05-28 15:37:37 +08:00
zhaolongfei
8e3231b506 Merge branch 'dev0525' of http://10.251.129.121/boeu/java-servers into dev0525 2024-05-28 15:10:51 +08:00
zhaolongfei
1c3a70bc12 修改 2024-05-28 15:10:33 +08:00
670788339
a62c39b13c 136 2024-05-28 14:16:51 +08:00
zhaolongfei
189a47d4d0 Merge branch 'zcwy0525-llf' into dev0525 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
 2024-05-27 09:15:58 +08:00
670788339
566146e670 修改进度同步执行顺序 2024-05-27 08:59:03 +08:00
zhaolongfei
0c98dbef06 Merge branch 'zcwy0525-llf' into dev0525 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/resources/application.properties
 2024-05-25 19:09:23 +08:00
zhaolongfei
73c2e8b54a 修改测试查询参数 2024-05-25 19:05:35 +08:00
zhaolongfei
bdfb400ad6 修改测试查询参数 2024-05-25 15:36:07 +08:00
zhaolongfei
858704a3d0 修改测试查询参数 2024-05-25 14:04:35 +08:00
zhaolongfei
3aa737ae15 在线状态时事同步 2024-05-25 13:55:57 +08:00
joshen
b872983795 Merge branch 'hongshan2' into 'master' 
修改bug

See merge request !97
 2024-05-24 23:53:08 +08:00
zengguoqing1988
4e7dc4c3e8 修改bug 2024-05-24 23:51:19 +08:00
zengguoqing1988
1822df3716 修改bug 2024-05-17 21:35:54 +08:00
joshen
d770b59a9b Merge branch 'zcwy0511-llf-prd' into 'master' 
Zcwy0511 llf prd

See merge request !94
 2024-05-13 20:56:32 +08:00
670788339
5f8cb7b511 生产参数修改 2024-05-13 20:56:10 +08:00
joshen
d3b7223f63 Merge branch 'zcwy0506-l' into 'master' 
652 为王芮（10726944）开通审核超级管理员权限

See merge request !93
 2024-05-13 17:59:59 +08:00
670788339
05c3e42b56 652 为王芮（10726944）开通审核超级管理员权限 2024-05-13 16:12:59 +08:00
670788339
58cf2bc928 调试 2024-05-12 03:52:38 +08:00
670788339
b8439a195c 调试 2024-05-12 03:47:16 +08:00
zhaolongfei
8d673a05eb 在线追加课程的学习时长修改最后学习时间 2024-05-11 23:14:26 +08:00
joshen
fa51f2bb7b Merge branch 'zcwy0506-l' into 'master' 
Zcwy0506 l

See merge request !92
 2024-05-09 17:48:58 +08:00
670788339
33e2e50e5b 考试重复提交判断-测试 2024-05-09 17:42:40 +08:00
670788339
674a73ff4a 考试重复提交判断-测试 2024-05-09 16:42:01 +08:00