Commit Graph

577 Commits

Author SHA1 Message Date
joshen
d7a38f5278 Merge branch 'master_20250318-lyc' into test20250220
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
2025-03-24 15:32:42 +08:00
670788339
be285a57dd 删除作业 2025-03-24 15:26:59 +08:00
joshen
c885da92c2 Merge branch 'master_20250318-lyc' into test20250220 2025-03-24 15:06:22 +08:00
670788339
50f653e9f6 删除作业 2025-03-24 14:20:52 +08:00
joshen
c968cf90d2 1 2025-03-20 11:38:07 +08:00
joshen
d08b459728 还原 2025-03-20 11:16:00 +08:00
joshen
f5bd93571d Merge branch 'master_20250318-lyc' into test20250220
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
2025-03-20 09:23:11 +08:00
670788339
c1e56d56f8 删除考试 2025-03-20 09:12:07 +08:00
joshen
372de0dc6d Merge branch 'master_1202' into test20250220 2025-03-20 08:32:55 +08:00
joshen
980d70c589 调试 2025-03-19 22:16:44 +08:00
joshen
64e0fa9013 调试 2025-03-19 22:14:38 +08:00
joshen
5259198523 Merge branch 'master_1202_0319' into test20250220 2025-03-19 22:10:40 +08:00
gengxin
0aeb6ce502 1. 线上 BUG2 2025-03-19 22:09:50 +08:00
joshen
42f22abe36 删除 logT(); 2025-03-19 21:56:28 +08:00
joshen
2a07273d6f Merge remote-tracking branch 'yx/master_1202_0319' into master_1202 2025-03-19 21:55:40 +08:00
joshen
aa2950594d Merge branch 'master_1202_0319' into test20250220 2025-03-19 21:50:29 +08:00
joshen
0794e705a8 Merge branch 'master_1202_0319' into test20250220 2025-03-19 21:50:19 +08:00
joshen
263f1cd31d 测试 2025-03-19 21:49:41 +08:00
gengxin
8e9a8de7cf 1. 线上 BUG2 2025-03-19 21:48:01 +08:00
joshen
a39a304924 放开 2025-03-19 21:31:12 +08:00
joshen
c3685f39fd Merge branch 'master_1202_0319' into master_1202
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
2025-03-19 21:17:34 +08:00
gengxin
00d0ad74a3 1. 线上 BUG1 2025-03-19 21:15:19 +08:00
joshen
11277aebe2 恢复 2025-03-19 21:03:47 +08:00
joshen
3c4c6005cc Merge branch 'master_1202_0319' into test20250220
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
2025-03-19 20:29:24 +08:00
gengxin
92cbc0bbcd 1. 线上 BUG 2025-03-19 20:09:10 +08:00
joshen
564c2ee9c9 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-19 19:32:30 +08:00
gengxin
9757166da5 1. 线上 BUG 5 2025-03-19 19:31:50 +08:00
joshen
64b1448b81 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-19 19:06:46 +08:00
gengxin
d70ac9664b 1. 线上 BUG 5 2025-03-19 19:04:51 +08:00
joshen
520c020d1b Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-19 18:43:15 +08:00
gengxin
7c8f01d95e 1. 线上 BUG 4 2025-03-19 18:42:42 +08:00
joshen
b882bdcd69 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-19 18:24:46 +08:00
gengxin
3920d049b9 1. 线上 BUG 3 2025-03-19 18:24:07 +08:00
joshen
6579bcfbd8 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-19 18:14:46 +08:00
gengxin
fa3d018c06 1. 线上 BUG 2025-03-19 18:13:55 +08:00
joshen
27b866e0bf Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-19 17:51:09 +08:00
gengxin
6da11202b9 1. 线上 BUG 2025-03-19 17:50:30 +08:00
joshen
46d60937b1 Merge branch '250213-prod-master_1202-gx' into test20250220
# Conflicts:
#	src/views/lecturer/Organization.vue
2025-03-19 17:23:40 +08:00
gengxin
01734506c7 1. 线上 BUG 2025-03-19 17:22:05 +08:00
joshen
76423e95a9 Merge branch '250213-prod-master_1202-gx' into test20250220 2025-03-19 17:15:48 +08:00
gengxin
b84b8a6ef6 1. 线上 BUG 2025-03-19 17:15:15 +08:00
670788339
86e8face63 pingcode1046 课程库 - 面授课 2025-03-18 09:42:04 +08:00
gengxin
1ee31a2757 最大字符 50 2025-03-03 20:19:42 +08:00
zhangsir
4ab81b307f 讲师管理bug 2024-12-23 10:47:55 +08:00
zhangsir
f5bb824397 讲师管理bug 2024-12-23 09:14:56 +08:00
zhangsir
9de8eb61d8 讲师管理bug 2024-12-21 16:13:30 +08:00
zhangsir
c2a31220b1 讲师管理bug 2024-12-17 11:19:50 +08:00
zhangsir
c1d8b2256e 讲师管理bug 2024-12-16 18:32:32 +08:00
zhangsir
6a32131c40 Merge branch 'new_1205_bug' into zcwy-teacher-manage 2024-12-16 10:02:50 +08:00
zhangsir
c51308a2a4 讲师管理bug 2024-12-14 17:20:06 +08:00