Commit Graph

3189 Commits

Author SHA1 Message Date
joshen
6cff9711f9 Merge remote-tracking branch 'zshyx/250207-growth-prod-master_1202-zp' into dev0515 2025-02-16 23:04:41 +08:00
Pengxiansen
5126636193 提交 2025-02-16 23:02:58 +08:00
joshen
02564b3798 Merge remote-tracking branch 'zshyx/250207-growth-prod-master_1202-zp' into dev0515 2025-02-16 20:11:46 +08:00
liu
4dd02dcbc6 修挂样式 2025-02-16 20:09:10 +08:00
joshen
5e23586451 Merge remote-tracking branch 'zshyx/250207-growth-prod-master_1202-zp' into dev0515 2025-02-16 17:39:02 +08:00
Pengxiansen
2456cf72ed 提交 2025-02-16 17:35:05 +08:00
joshen
cc77356bf0 Merge remote-tracking branch 'zshyx/250207-growth-prod-master_1202-zp' into dev0515 2025-02-14 16:15:23 +08:00
Pengxiansen
315b01999d 提交 2025-02-14 14:41:48 +08:00
joshen
b1704c8c5f Merge remote-tracking branch 'zshyx/250207-growth-prod-master_1202-zp' into dev0515
# Conflicts:
#	src/components/UserCenter/menu.vue
2025-02-13 18:14:26 +08:00
joshen
346f3dab1d Merge remote-tracking branch 'zshyx/250207-growth-prod-master_1202-zp' into dev0515 2025-02-13 17:57:49 +08:00
Pengxiansen
2b45e63c54 提交 2025-02-13 17:41:27 +08:00
Pengxiansen
1927b5b67f 提交 2025-02-13 17:36:21 +08:00
zhangsir
debb88f952 Merge branch 'zcwy_1127_teacher' into dev0515 2025-01-15 11:08:55 +08:00
zhangsir
f3936d5110 授课记录调整 2025-01-15 11:07:24 +08:00
joshen
914450750e Merge remote-tracking branch '121/dev0515' into dev0515 2024-12-24 16:27:14 +08:00
joshen
2fe10d88f2 Merge branch 'zcwy_0822_case' into dev0515
# Conflicts:
#	src/views/hotforum/Index.vue
2024-12-24 16:26:49 +08:00
zhangsir
c5f6f5c83e 替换图片 2024-12-24 16:22:37 +08:00
zhangsir
5be181df8c 回退授课记录页面 2024-12-12 16:45:08 +08:00
zhangsir
189e157c3d Merge branch 'zcwy_0822_case' into dev0515 2024-12-10 19:54:20 +08:00
zhangsir
45027ca77e 2024 2024-12-10 19:53:38 +08:00
zhangsir
fe78855497 Merge branch 'zcwy_1127_teacher' into dev0515 2024-12-10 14:34:48 +08:00
zhangsir
acbacac737 讲师管理授课记录讲师端 2024-12-10 14:32:51 +08:00
zhangsir
bbb2f3c1a3 Merge branch 'pingcode-1104' into dev0515 2024-12-04 16:48:58 +08:00
zhangsir
7375f9df04 上传视频修改逻辑 2024-12-04 16:47:57 +08:00
zhangsir
a303a5199c Merge branch 'zcwy_1127_teacher' into dev0515 2024-12-02 17:44:31 +08:00
zhangsir
1ad2c80c9b 添加教师修改接口 2024-12-02 17:43:50 +08:00
zhangsir
1a03c84db0 Merge branch 'zcwy_1127_teacher' into dev0515 2024-11-27 18:12:36 +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
4cf28b4e91 Merge branch 'zcwy_0822_case' into dev0515 2024-11-14 17:36:07 +08:00
zhangsir
6bf278c148 讲师视频下一步展示问题 2024-11-14 17:35:26 +08:00
zhangsir
89ff9c5da7 Merge branch 'pingcode-1104' into dev0515 2024-11-11 09:39:06 +08:00
zhangsir
efb70690c3 视频选择回显修改 2024-11-11 09:38:25 +08:00
zhangsir
c17e55bcac Merge branch 'pingcode-1104' into dev0515 2024-11-10 19:51:02 +08:00
zhangsir
f32d6992fa 视频选择回显修改 2024-11-10 19:50:23 +08:00
zhangsir
9839daa3b5 Merge branch 'pingcode-1104' into dev0515 2024-11-10 19:23:44 +08:00
zhangsir
c84c338442 视频选择修改 2024-11-10 19:22:50 +08:00
zhangsir
c25c50838f Merge branch 'pingcode-1104' into dev0515 2024-11-10 17:26:37 +08:00
zhangsir
ff7dd81608 视频选择修改 2024-11-10 17:25:48 +08:00
zhangsir
1600029a6f Merge branch 'pingcode-1104' into dev0515 2024-11-08 19:36:10 +08:00
zhangsir
ea2740542e 视频拖动修改 2024-11-08 19:35:32 +08:00
zhangsir
5593381330 Merge branch 'pingcode-1104' into dev0515 2024-11-08 19:13:53 +08:00
zhangsir
7ccb624724 视频选择修改 2024-11-08 19:13:15 +08:00
zhangsir
9e8941de2d Merge branch 'pingcode-1104' into dev0515 2024-11-08 13:40:08 +08:00
zhangsir
638d6c5677 视频长传修改逻辑 2024-11-08 13:39:10 +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
1d9b01c78e 解决合并代码导致的报错 2024-11-04 17:51:57 +08:00