Commit Graph

2962 Commits

Author SHA1 Message Date
joshen
5f9da5cf03 Merge branch 'zcwy_0822_case' into master_1202
# Conflicts:
#	src/views/hotforum/Index.vue
2024-12-27 16:15:16 +08:00
zhangsir
1b3064f2ab 替换图片 2024-12-27 16:11:01 +08:00
joshen
24be910b83 回退图片 2024-12-25 14:20:11 +08:00
joshen
6153daa98a Merge branch 'zcwy_0822_case' into master_1202
# Conflicts:
#	src/views/hotforum/Index.vue
2024-12-24 16:40:18 +08:00
zhangsir
c5f6f5c83e 替换图片 2024-12-24 16:22:37 +08:00
joshen
4d0cae9346 Merge branch 'zcwy_1127_teacher' into master_1202 2024-12-12 16:46:44 +08:00
zhangsir
5be181df8c 回退授课记录页面 2024-12-12 16:45:08 +08:00
joshen
67f2ff3e86 重新提交 2024-12-12 11:56:35 +08:00
joshen
3588ef3e67 回退 2024-12-12 11:42:11 +08:00
joshen
7fab8bb062 huancun 2024-12-12 11:12:54 +08:00
joshen
977af999a3 huancun 2024-12-12 11:10:03 +08:00
joshen
cc0362380e Merge branch 'zcwy_0822_case' into master_1202 2024-12-12 10:56:07 +08:00
zhangsir
45027ca77e 2024 2024-12-10 19:53:38 +08:00
joshen
83838b2c1a Merge branch 'zcwy_1127_teacher' into master_1202 2024-12-10 18:15:33 +08:00
zhangsir
acbacac737 讲师管理授课记录讲师端 2024-12-10 14:32:51 +08:00
joshen
f98fda4f78 Merge remote-tracking branch 'yx/zcwy_1127_teacher' into master_1202 2024-12-02 19:21:14 +08:00
zhangsir
1ad2c80c9b 添加教师修改接口 2024-12-02 17:43:50 +08:00
zhangsir
21afc82036 添加教师修改接口 2024-11-27 18:11:49 +08:00
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
88b09f1252 Merge branch 'master-video-0930' into 'master'
PC视频播放器添加禁止拖动视频

See merge request !123
2024-10-15 17:49:10 +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