joshen
|
c8512a86df
|
Merge remote-tracking branch 'yx/master-20250414-lyc' into test
|
2025-04-18 09:02:52 +08:00 |
|
670788339
|
95312696f6
|
studyindex缓存获取duration
|
2025-04-17 13:36:30 +08:00 |
|
joshen
|
2e7b2ab085
|
Merge remote-tracking branch 'yx/master-20250414-lyc' into test
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseTask.java
|
2025-04-14 16:11:48 +08:00 |
|
670788339
|
1aca002b8f
|
合并测试
|
2025-04-14 16:10:18 +08:00 |
|
joshen
|
6fa5d8bb0d
|
Merge remote-tracking branch 'yx/master-20250414-lyc' into test
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseTask.java
|
2025-04-14 15:49:13 +08:00 |
|
670788339
|
50bdc39ce8
|
appendtime 于 study-video-time 合并
|
2025-04-14 14:08:01 +08:00 |
|
joshen
|
4fff780970
|
Merge branch '250408-bugfix-shl' into release-20250328-master
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
|
2025-04-09 18:16:07 +08:00 |
|
joshen
|
14376b21b4
|
Merge branch '250408-bugfix-shl' into test
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java
|
2025-04-09 09:52:14 +08:00 |
|
sunhonglai
|
47813ea565
|
增加面授课删除
|
2025-04-08 17:43:37 +08:00 |
|
joshen
|
29221d8f25
|
Merge remote-tracking branch 'yx/master-20250403-lyc' into test
|
2025-04-03 09:42:19 +08:00 |
|
670788339
|
5aa62de3cb
|
@Transient
|
2025-04-03 09:09:58 +08:00 |
|
joshen
|
a309bc1ddf
|
Merge branch '250331-bugfix-shl-newmaster' into release-20250328-master
|
2025-04-02 16:57:24 +08:00 |
|
joshen
|
672487e29d
|
Merge branch '250331-bugfix-shl-newmaster' into test
|
2025-04-01 13:53:22 +08:00 |
|
sunhonglai
|
6af4cdfc75
|
修改测试环境配置
|
2025-04-01 13:52:20 +08:00 |
|
joshen
|
b7834eadf9
|
Merge branch '250331-bugfix-shl-newmaster' into test
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseESApi.java
|
2025-04-01 13:37:24 +08:00 |
|
sunhonglai
|
2a2759768b
|
修改个人中心我的报名图片不显示问题
|
2025-04-01 12:42:32 +08:00 |
|
joshen
|
14bd304374
|
Merge branch '250331-bugfix-shl' into test
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java
# servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
|
2025-04-01 10:25:53 +08:00 |
|
sunhonglai
|
74bcec72bc
|
修改学习时长取值
|
2025-04-01 09:59:59 +08:00 |
|
sunhonglai
|
b8c171bf86
|
Merge branch '250331-bugfix-shl-newmaster' into 250331-bugfix-shl
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
|
2025-04-01 09:51:14 +08:00 |
|
joshen
|
447a65ee6f
|
Merge branch '250331-bugfix-shl' into test
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
|
2025-04-01 09:17:04 +08:00 |
|
sunhonglai
|
175e7f6c28
|
查询课程和修改课程学习上报进度，增加视频播放进度的处理
|
2025-04-01 08:32:41 +08:00 |
|
sunhonglai
|
5705bb8529
|
查询课程和修改课程学习上报进度，增加视频播放进度的处理
|
2025-03-31 13:14:14 +08:00 |
|
sunhonglai
|
87e5dd81f8
|
查询课程和修改课程学习上报进度，增加视频播放进度的处理
|
2025-03-31 11:27:13 +08:00 |
|
joshen
|
d88b285729
|
Merge remote-tracking branch 'yx/master-20250227-lyc' into test
|
2025-03-29 13:00:12 +08:00 |
|
670788339
|
d3e84feb48
|
日志
|
2025-03-29 12:58:43 +08:00 |
|
joshen
|
9924769bc8
|
Merge remote-tracking branch 'yx/master-20250227-lyc' into release-20250328-master
|
2025-03-29 12:38:10 +08:00 |
|
joshen
|
318ba14fd3
|
Merge remote-tracking branch 'yx/master-20250227-lyc' into test
|
2025-03-29 12:23:11 +08:00 |
|
670788339
|
d4964ca7f1
|
日志
|
2025-03-29 12:22:11 +08:00 |
|
joshen
|
5ad578454e
|
Merge remote-tracking branch 'yx/master-20250227-lyc' into test
|
2025-03-29 11:03:17 +08:00 |
|
670788339
|
efdfa6f00c
|
study-video-time 最后修改时间调整
|
2025-03-29 10:51:08 +08:00 |
|
joshen
|
ceb30f7f1d
|
Merge remote-tracking branch 'yx/master-20250227-lyc' into release-20250328-master
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java
# servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
|
2025-03-28 15:32:27 +08:00 |
|
joshen
|
60d891edcf
|
Merge remote-tracking branch 'yx/250324-casebugfix-zsh'
|
2025-03-26 16:54:25 +08:00 |
|
joshen
|
052f673fc8
|
Merge remote-tracking branch 'yx/250324-casebugfix-zsh' into test
|
2025-03-25 08:48:55 +08:00 |
|
emcchui
|
b9f00f2602
|
SZX-927：学员端-个人设置-手机号未同步到
|
2025-03-25 08:47:19 +08:00 |
|
joshen
|
451156265e
|
Merge remote-tracking branch 'yx/250324-casebugfix-zsh' into test
|
2025-03-25 08:41:12 +08:00 |
|
emcchui
|
77884d3e7e
|
SZX-927：学员端-个人设置-手机号未同步到
|
2025-03-25 08:39:48 +08:00 |
|
joshen
|
ff299b7697
|
Merge remote-tracking branch 'yx/250324-casebugfix-zsh' into test
|
2025-03-24 18:14:22 +08:00 |
|
emcchui
|
3a9a8d86af
|
SZX-927：学员端-个人设置-手机号未同步到
|
2025-03-24 18:10:41 +08:00 |
|
joshen
|
66e4187be2
|
Merge remote-tracking branch 'yx/250324-casebugfix-zsh' into test
|
2025-03-24 17:53:08 +08:00 |
|
joshen
|
436f7647ce
|
Merge remote-tracking branch 'yx/250324-casebugfix-zsh' into test
|
2025-03-24 17:49:26 +08:00 |
|
emcchui
|
3a139925c9
|
SZX-927：学员端-个人设置-手机号未同步到
|
2025-03-24 17:41:22 +08:00 |
|
emcchui
|
fdc0c7959e
|
SZX-927：学员端-个人设置-手机号未同步到
|
2025-03-24 16:27:50 +08:00 |
|
joshen
|
5c9237cb79
|
Merge branch '250324-bugfix-shl' into test
|
2025-03-24 10:14:45 +08:00 |
|
sunhonglai
|
a1352ec813
|
修改后端返回分页结果
|
2025-03-24 09:23:06 +08:00 |
|
joshen
|
889f634c5e
|
Merge branch '250321-bugfix-gx' into test
# Conflicts:
# servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java
# servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
|
2025-03-21 16:08:15 +08:00 |
|
gengxin
|
978e1a7bf2
|
分析数据 img 是否为空
|
2025-03-21 15:26:41 +08:00 |
|
670788339
|
c9db78ea94
|
在线课-外部讲师 补充
|
2025-03-21 09:42:02 +08:00 |
|
670788339
|
f33de0c326
|
在线课-外部讲师
|
2025-03-20 20:57:49 +08:00 |
|
670788339
|
4be72391ad
|
在线课-外部讲师报错 添加讲师类型
|
2025-03-20 17:37:04 +08:00 |
|
joshen
|
5fe9019d87
|
Merge branch 'master-20250227-lyc' into test
|
2025-03-19 13:20:33 +08:00 |
|