Commit Graph

1516 Commits

Author SHA1 Message Date
Wangxxz
b701f88586 Merge branch 'yx1101-teacher-l' into dev1107 2024-12-13 14:33:51 +08:00
Wangxxz
6532cf75e3 修改方法名称 2024-12-13 14:33:25 +08:00
Wangxxz
ad357a61b7 修改方法名称 2024-12-13 14:17:48 +08:00
Wangxxz
f577e82551 Merge branch 'yx1101-teacher-l' into dev1107 2024-12-12 11:27:05 +08:00
Wangxxz
ffe232eeb9 注释同步在线课评分 2024-12-12 11:25:28 +08:00
Wangxxz
f273e9df4a 加bean字段 2024-12-03 10:22:43 +08:00
Wangxxz
ee25fa40cd Merge remote-tracking branch '121/dev1107' into dev1107 2024-12-03 10:11:18 +08:00
Wangxxz
45d38d6df7 Merge branch 'yx1101-teacher-l' into dev1107 2024-12-03 10:10:20 +08:00
Wangxxz
aab82de81b 加bean字段 2024-12-03 10:01:31 +08:00
yang
3703cfb9c8 Merge remote-tracking branch 'origin/dev1107' into dev1107 2024-11-30 12:11:41 +08:00
yang
3a1908532e Merge branch 'refs/heads/master-1129' into dev1107
# Conflicts:
#	servers/boe-server-all/pom.xml
2024-11-30 12:09:09 +08:00
yang
4205912db5 定时任务测试 2024-11-30 12:08:11 +08:00
Wangxxz
af6efd3151 统一讲师查询 还原 2024-11-26 13:22:17 +08:00
Wangxxz
963fae8191 Merge branch 'yx1101-teacher-l' into dev1107 2024-11-26 11:25:33 +08:00
Wangxxz
c724080a3c 统一讲师查询 2024-11-26 11:24:17 +08:00
Wangxxz
b2bad03ba9 Merge branch 'yx1101-teacher-l' into dev1107 2024-11-26 11:21:08 +08:00
Wangxxz
aa63a6618f 统一讲师查询 2024-11-26 11:20:50 +08:00
Wangxxz
4152baf8de Merge branch 'yx1101-teacher-l' into dev1107 2024-11-26 10:16:32 +08:00
Wangxxz
d3fcbaeab6 统一案例接口 2024-11-26 09:26:44 +08:00
Wangxxz
0f2d8af1e4 Merge branch 'yx1101-teacher-l' into dev1107 2024-11-22 11:42:17 +08:00
Wangxxz
82bf84bbaa 未开课在线课同步 2024-11-22 11:30:14 +08:00
nisen
423b658e04 Merge branch 'yx1107-bug-l' into 104-master 2024-11-18 20:08:14 +08:00
Wangxxz
acc62c85e0 优化 2024-11-18 20:07:36 +08:00
nisen
795966d944 Merge branch 'yx1107-bug-l' into 104-master 2024-11-18 15:46:23 +08:00
Wangxxz
ec00f55606 频繁调用finishCheck100进度更新 2024-11-18 15:43:01 +08:00
Wangxxz
4d161a1d36 Merge branch 'yx1101-teacher-l' into dev1107 2024-11-16 10:28:06 +08:00
Wangxxz
3f59552c2e 提交 2024-11-16 10:21:12 +08:00
zhaolongfei
971478f206 Merge branch 'zcwy1030-llf' into dev1107-121 2024-11-11 15:15:55 +08:00
zhaolongfei
eaafb57b83 视频进行工号验证 2024-11-11 15:15:28 +08:00
zhaolongfei
ee74f47261 视频进行工号验证 2024-11-11 15:12:27 +08:00
zhaolongfei
c0a00e9647 Merge remote-tracking branch 'origin/dev1107' into dev1107-121 2024-11-11 10:49:58 +08:00
zhaolongfei
9d3bbcbf3a Merge branch 'zcwy1108-llf' into dev1107-121 2024-11-11 10:49:43 +08:00
zhaolongfei
05dc7b984f 注释代码 2024-11-11 10:49:04 +08:00
nisen
5b4afdde65 Merge remote-tracking branch '121/dev1107' into dev1107-121 2024-11-10 20:36:50 +08:00
nisen
53ff0d979e Merge branch 'zcwy1108-llf' into dev1107-121
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java
2024-11-10 20:36:14 +08:00
nisen
9a28d65c54 Merge branch 'zcwy1108-llf' into dev1107-121
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
2024-11-10 20:34:58 +08:00
zhaolongfei
32fcc830de Merge branch 'zcwy1108-llf' into dev1107-121 2024-11-10 20:32:48 +08:00
zhaolongfei
d0e5f8c329 编辑视频时长的时候直接修改文件时长 2024-11-10 20:31:47 +08:00
zhaolongfei
9c5941fd6b Merge branch 'zcwy1108-llf' into dev1107-121
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
#	servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java
2024-11-10 19:31:56 +08:00
zhaolongfei
2c94b09199 在线课上传视频失败修改 2024-11-10 19:25:08 +08:00
zhaolongfei
e5c8dbabed 无目录无权限不能报名 2024-11-10 14:00:11 +08:00
Wangxxz
e0d731e296 更改在线课状态 2024-11-09 16:52:07 +08:00
Wangxxz
f5c26d02d1 更改在线课状态 2024-11-09 16:51:34 +08:00
zhaolongfei
d147a5f861 添加日志 2024-11-08 19:35:12 +08:00
zhaolongfei
e9995753c7 添加日志 2024-11-08 19:34:36 +08:00
zhaolongfei
e59aab127f 添加日志 2024-11-08 19:21:47 +08:00
zhaolongfei
ede76f74e8 添加日志 2024-11-08 19:13:41 +08:00
zhaolongfei
f28d120688 添加日志 2024-11-08 19:01:56 +08:00
zhaolongfei
425a1edf01 添加日志 2024-11-08 18:45:14 +08:00
zhaolongfei
d9d1e0fecc 视频进行工号验证 2024-11-08 17:34:07 +08:00