Commit Graph

2707 Commits

Author SHA1 Message Date
joshen
3e137990b7 Merge branch 'zcwy_0822_case' into dev_master 2024-11-26 20:48:58 +08:00
zhangsir
602a49e292 视频禁止拖动修改 2024-11-26 17:43:07 +08:00
nisen
0397b4c310 Merge branch 'zcwy_0822_case' into dev_master 2024-11-18 20:17:16 +08:00
zhangsir
6bf278c148 讲师视频下一步展示问题 2024-11-14 17:35:26 +08:00
nisen
3080303fa3 Merge branch 'pingcode-1104' into dev_master 2024-11-07 17:28:03 +08:00
nisen
50dca2caa9 Merge branch 'zcwy_0822_case' into dev_master 2024-11-04 17:53:51 +08:00
zhangsir
2576fdd070 授课教师名称增加工号 2024-11-04 16:26:43 +08:00
zhangsir
548d891be3 一上来搜索的条数改为20 2024-11-04 15:28:38 +08:00
zhangsir
0dc3884d46 讲师认证修改参数改为keyword 2024-11-01 17:03:33 +08:00
nisen
633ddbd51c Merge branch 'zcwy_0822_case' into dev_master 2024-10-31 21:06:42 +08:00
zhangsir
22861dadf2 userNo修改参数 2024-10-30 17:57:56 +08:00
nisen
493ebfa05b Merge remote-tracking branch '104/master' into dev_master 2024-10-17 17:42:47 +08:00
nisen
78e75db403 Merge branch 'zcwy_0806_paihangb' into dev_master 2024-10-17 17:42:12 +08:00
zhangsir
0ebbb0399f 学习天数修改 2024-10-17 09:13:49 +08:00
joshen
61cdd7c821 Merge branch 'master-video-0930' into 'master'
pc播放器拖动修改

See merge request !124
2024-10-16 19:58:18 +08:00
joshen
90ca7e4750 pc播放器拖动修改 2024-10-16 19:53:35 +08:00
zhangsir
14a94d1fb1 排行榜修改 2024-10-16 16:49:14 +08:00
nisen
e44279c92f Merge branch 'master_1008' into dev_master 2024-10-15 18:14:56 +08:00
joshen
6b6e8a4096 pc视频播放器禁止拖动 2024-10-10 23:07:46 +08:00
joshen
590da41c59 PC视频播放器添加禁止拖动视频 2024-10-10 23:00:16 +08:00
nisen
cbedc3f880 Merge branch 'zcwy_0806_paihangb' into master_1008 2024-10-10 16:53:12 +08:00
nisen
979deec1a4 Merge branch 'zcwy_0723_hotforum' into master_1008 2024-10-09 19:15:03 +08:00
nisen
2e51ef1a2f Merge branch 'zcwy_0822_case' into master_1008 2024-10-09 13:48:20 +08:00
zhangsir
2fc835ca8d 认证讲师库修改名字 2024-10-09 13:45:54 +08:00
zhangsir
dc01a523f7 新增视频缓存打印 2024-10-09 12:15:08 +08:00
zhangsir
ea910687f5 删除打印 2024-10-09 11:20:15 +08:00
zhangsir
f27d82c536 打印报错信息 2024-10-09 11:10:48 +08:00
zhangsir
f6c4e984df 打印报错信息 2024-10-09 10:51:19 +08:00
zhangsir
14bf033539 自定义考试修改数据结构 2024-10-09 09:16:05 +08:00
nisen
2fa1226004 Merge branch 'zcwy_0806_paihangb' into master_1008 2024-10-08 18:01:17 +08:00
zhangsir
25187601cc 考试修改 2024-10-08 15:54:56 +08:00
nisen
bb89315102 Merge branch 'zcwy_0726_download' into dev_master 2024-09-27 20:43:42 +08:00
zhangsir
75eba179d1 添加报错信息 2024-09-27 20:42:48 +08:00
nisen
3b90fd3597 Merge branch 'zcwy_0726_download' into dev_master 2024-09-27 20:21:11 +08:00
zhangsir
54435b91d1 补全代码 2024-09-27 20:15:23 +08:00
nisen
14eb6abc0d Merge branch 'zcwy_0726_download' into dev_master 2024-09-27 19:48:28 +08:00
zhangsir
73cca9ce75 增加 2024-09-27 19:47:33 +08:00
nisen
c5c7aa175d Merge branch 'zcwy_0822_case' into dev_master 2024-09-27 17:52:02 +08:00
nisen
05a3d9b874 Merge branch 'zcwy_0723_hotforum' into dev_master 2024-09-27 17:40:42 +08:00
nisen
7d98bb4ddf 补交回退导致丢失的文件 2024-09-27 17:39:51 +08:00
nisen
336d692ea9 Merge branch 'zcwy_0726_download' into dev_master 2024-09-27 17:35:48 +08:00
zhangsir
b8d84c3be6 试题导入报错显示 2024-09-27 15:39:18 +08:00
nisen
1e867452bd Merge branch 'zcwy_0723_hotforum' into dev_master 2024-09-25 16:59:50 +08:00
zhangsir
56634f8117 pdf为空加载异常 2024-09-25 11:02:11 +08:00
zhangsir
6a60787eda 在线科考试提交新增时间 2024-09-24 14:39:16 +08:00
zhangsir
daf6d5fa23 排行榜前两个默认显示当前数据 2024-09-18 10:26:50 +08:00
zhangsir
32c43ada27 排行榜修改,取消学习天数当前,保留其他两个 2024-09-18 10:03:53 +08:00
zhangsir
f1a1d45328 修改只取两个 2024-09-14 17:44:17 +08:00
nisen
8af7198863 补交文件3 2024-09-14 14:02:27 +08:00
nisen
c4f5d94135 补交文件2 2024-09-14 13:18:38 +08:00