hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-09 19:06:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,395 Commits 91 Branches 1 Tag
41c1321769534134a0af7a51f475b288f244d4aa
Commit Graph

1395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhaolongfei
9fb1b432ee Merge branch 'zcwy0606-llf' into dev0525 2024-06-19 16:43:30 +08:00
zhaolongfei
e2c697f860 修改bug 2024-06-19 16:43:08 +08:00
zhaolongfei
d47669b3ea Merge branch 'zcwy0618-llf' into dev0525 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
 2024-06-19 15:50:50 +08:00
zhaolongfei
33fee46433 在线课考试成绩为空问题修改 2024-06-19 15:49:35 +08:00
xiaozhequ
ec8ffcb947 Merge remote-tracking branch 'origin/dev0525' into dev0525 2024-06-19 15:35:45 +08:00
xiaozhequ
105d29b754 Merge branch 'zcwy-0613-wjw' into dev0525 2024-06-19 15:35:18 +08:00
xiaozhequ
de69ba1c11 在线课权限查询 2024-06-19 15:34:53 +08:00
zhaolongfei
a227cb96d2 Merge branch 'dev0525' of http://10.251.129.121/boeu/java-servers into dev0525 2024-06-19 13:56:50 +08:00
zhaolongfei
b2ff1a208d Merge branch 'zcwy0606-llf' into dev0525 2024-06-19 13:56:28 +08:00
zhaolongfei
c6a785bb4f 添加视频暂存点 2024-06-19 13:55:54 +08:00
xiaozhequ
76aa90a0ce Merge branch 'zcwy-0613-wjw' into dev0525 2024-06-18 15:49:38 +08:00
xiaozhequ
2fcdb6b4b6 代码还原 2024-06-18 15:49:10 +08:00
zhaolongfei
7d08954525 修改项目下考试结束时间并未生效修复 2024-06-18 15:05:42 +08:00
xiaozhequ
7168452b0d Merge branch 'zcwy-0613-wjw' into dev0525 2024-06-18 14:57:04 +08:00
xiaozhequ
62884bcc15 所有后台人过滤在线课 2024-06-18 14:56:28 +08:00
zhaolongfei
4b4f3b9620 Merge branch 'zcwy0606-llf' into dev0525 2024-06-18 13:48:18 +08:00
zhaolongfei
8567fa9ecc content表添加processVideo字段,添加判断 2024-06-18 13:47:46 +08:00
zhaolongfei
72f033a769 Merge branch 'zcwy0606-llf' into dev0525 2024-06-18 13:38:02 +08:00
zhaolongfei
359b66e48a content表添加processVideo字段,添加判断 2024-06-18 13:31:39 +08:00
zhaolongfei
9deeed5764 Merge branch 'zcwy0606-llf' into dev0525 2024-06-18 11:12:49 +08:00
zhaolongfei
8125a6bd77 content表添加processVideo字段,添加判断 2024-06-18 11:12:08 +08:00
zhaolongfei
1bd4764eee Merge branch 'zcwy0606-llf' into dev0525 2024-06-18 09:10:38 +08:00
zhaolongfei
9b37e8a73d content表添加processVideo字段,添加判断 2024-06-18 09:09:52 +08:00
zhaolongfei
7f2c57099b Merge branch 'dev0525' of http://10.251.129.121/boeu/java-servers into dev0525 2024-06-17 16:17:22 +08:00
zhaolongfei
16b6c419ab Merge branch 'zcwy0606-llf' into dev0525 2024-06-17 16:17:00 +08:00
zhaolongfei
2fa3378e94 content表添加processVideo字段 2024-06-17 16:16:29 +08:00
xiaozhequ
726fc2e684 Merge branch 'zcwy-0613-wjw' into dev0525 2024-06-13 18:15:39 +08:00
xiaozhequ
dd0af3cbef 选择在线可时增加数据权限逻辑 2024-06-13 18:11:41 +08:00
zhaolongfei
cc1900f907 Merge branch 'zcwy0606-llf' into dev0525 2024-06-13 15:29:03 +08:00
zhaolongfei
0b7784779f item添加processVideo字段 2024-06-13 15:28:13 +08:00
zhaolongfei
61caaa6b12 Merge branch 'zcwy0606-llf' into dev0525 2024-06-06 18:11:23 +08:00
zhaolongfei
e03118275d 修改项目下考试结束时间并未生效修复 2024-06-06 18:10:28 +08:00
zhaolongfei
4c1afd1130 Merge branch 'zcwy0606-llf' into dev0525 2024-06-06 16:36:22 +08:00
zhaolongfei
1b1cb17861 Merge branch 'zcwy0525-llf' into zcwy0606-llf 2024-06-06 16:35:40 +08:00
zhaolongfei
a35c1faa49 学员在线删除失败的bug修复 2024-06-06 16:32:33 +08:00
joshen
e22eb9786b Merge branch 'zcwy0525-llf' into 'master' 
Zcwy0525 llf

See merge request !104
 2024-06-04 17:45:24 +08:00
zhaolongfei
58e694aaf1 Merge branch 'zcwy0525-llf' into dev0525 2024-06-03 17:54:32 +08:00
zhaolongfei
f54e42de85 学员在线删除失败的bug修复,添加参数 2024-06-03 17:54:04 +08:00
zhaolongfei
eb0184762a Merge branch 'zcwy0525-llf' into dev0525 2024-06-03 15:26:09 +08:00
zhaolongfei
cceccab48e 学员在线删除失败的bug修复 2024-06-03 15:25:29 +08:00
zhaolongfei
b595800344 Merge branch 'zcwy0525-llf' into dev0525 2024-06-03 14:40:50 +08:00
zhaolongfei
b9143eacf6 学员在线删除失败的bug修复 2024-06-03 14:34:06 +08:00
zhaolongfei
d1bff77f1f 配置文件回退 2024-05-30 09:05:55 +08:00
670788339
ac931216aa 配置文件 2024-05-29 18:17:12 +08:00
670788339
aad54ee66f 配置文件 2024-05-29 17:59:07 +08:00
joshen
7521f350f0 Merge branch 'zcwy0525-llf' into 'master' 
Zcwy0525 llf

See merge request !103
 2024-05-29 17:47:49 +08:00
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