3167 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
zhangsir	602a49e292	视频禁止拖动修改	2024-11-26 17:43:07 +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
zhangsir	1d9b01c78e	解决合并代码导致的报错	2024-11-04 17:51:57 +08:00
zhangsir	a9ec47a39a	解决合并代码导致的报错	2024-11-04 16:35:34 +08:00
zhangsir	c64969e9b7	Merge branch 'pingcode-1104' into dev0515 ... # Conflicts: # src/components/PortalHeader.vue # src/components/VideoPlayer/progress-bar.vue # src/views/study/coursenew.vue	2024-11-04 16:29:52 +08:00
zhangsir	2576fdd070	授课教师名称增加工号	2024-11-04 16:26:43 +08:00
zhangsir	642907b386	Merge branch 'zcwy_0822_case' into dev0515 ... # Conflicts: # src/views/lecturer/TwoCoaching.vue	2024-11-04 15:30:12 +08:00
zhangsir	548d891be3	一上来搜索的条数改为20	2024-11-04 15:28:38 +08:00
zhangsir	0dc3884d46	讲师认证修改参数改为keyword	2024-11-01 17:03:33 +08:00
zhangsir	ecfc6fcae7	Merge branch 'zcwy_0806_paihangb' into dev0515	2024-11-01 14:28:48 +08:00
zhangsir	de88a75aaa	视频取消token参数，改为sign增加工号	2024-11-01 14:27:50 +08:00
zhangsir	a8fe656436	Merge branch 'zcwy_0806_paihangb' into dev0515	2024-11-01 11:14:37 +08:00
zhangsir	b6bc60d8b9	视频增加token参数不加密	2024-11-01 11:13:53 +08:00
nisen	633ddbd51c	Merge branch 'zcwy_0822_case' into dev_master	2024-10-31 21:06:42 +08:00
zhangsir	263bd22e5e	Merge branch 'zcwy_0806_paihangb' into dev0515	2024-10-31 19:05:22 +08:00
zhangsir	22668d756f	视频增加token参数	2024-10-31 19:04:20 +08:00
zhangsir	22861dadf2	userNo修改参数	2024-10-30 17:57:56 +08:00
zhangsir	cd19cd5f66	Merge branch 'zcwy_0806_paihangb' into dev0515	2024-10-30 17:48:13 +08:00
zhangsir	041643a135	都改	2024-10-30 17:47:33 +08:00
zhangsir	885c7f9242	再改	2024-10-30 17:39:47 +08:00
zhangsir	6fd33ddd88	再改	2024-10-30 17:38:36 +08:00
zhangsir	f688f5086f	Merge branch 'zcwy_0806_paihangb' into dev0515	2024-10-30 17:27:04 +08:00
zhangsir	3d4d3f4d25	改回去	2024-10-30 17:26:22 +08:00
zhangsir	cb954b8bce	Merge branch 'zcwy_0806_paihangb' into dev0515	2024-10-30 15:20:43 +08:00
zhangsir	b386681aab	userNo修改参数	2024-10-30 15:20:01 +08:00