sunhonglai
|
ed592bd0b9
|
恢复原提示
|
2025-04-28 14:08:17 +08:00 |
|
joshen
|
3411f214bd
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-28 13:51:39 +08:00 |
|
sunhonglai
|
e9af9a5349
|
SZX-1091 修改删除显示控制和placehold显示
|
2025-04-28 13:51:17 +08:00 |
|
joshen
|
d57c6afbf2
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-28 11:40:35 +08:00 |
|
sunhonglai
|
7551d8ad6d
|
SZX-1091 优化讲师份部份页面
|
2025-04-28 11:39:30 +08:00 |
|
joshen
|
2e0c89b570
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-27 14:33:42 +08:00 |
|
sunhonglai
|
93ba27d1fe
|
修改讲师体系,需要重置讲师级别
|
2025-04-27 14:32:29 +08:00 |
|
joshen
|
fdfa85e2f4
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-27 14:13:33 +08:00 |
|
sunhonglai
|
809eb3cafa
|
去掉悬浮无用代码
|
2025-04-27 13:40:39 +08:00 |
|
sunhonglai
|
6d425982cc
|
Merge remote-tracking branch 'origin/250403-szx-1017-shl' into 250403-szx-1017-shl
|
2025-04-27 13:27:10 +08:00 |
|
sunhonglai
|
48f5fa1ac5
|
修改讲师体系搜索联动处理
|
2025-04-27 13:25:56 +08:00 |
|
joshen
|
ee69294683
|
Merge branch '250403-szx-1017-shl' into test20250220
|
2025-04-27 11:03:30 +08:00 |
|
sunhonglai
|
4aec11a4e1
|
修改鼠标悬停提示处理
|
2025-04-27 11:00:41 +08:00 |
|
joshen
|
747fcda67d
|
Merge branch '250403-szx-1017-shl' into test20250220
|
2025-04-27 10:22:05 +08:00 |
|
sunhonglai
|
d79c628711
|
修改鼠标悬停提示处理
|
2025-04-27 10:19:25 +08:00 |
|
joshen
|
a89d64fce1
|
Merge branch '250403-szx-1017-shl' into test20250220
|
2025-04-27 08:47:36 +08:00 |
|
sunhonglai
|
a836f9d0ec
|
修改id参数
|
2025-04-27 08:46:17 +08:00 |
|
joshen
|
42c56c14d4
|
Merge branch '250403-szx-1017-shl' into test20250220
|
2025-04-27 08:32:50 +08:00 |
|
sunhonglai
|
b93faa3761
|
培训发生组织审批中心增加提交按钮
|
2025-04-25 15:44:23 +08:00 |
|
joshen
|
4a2589afb8
|
Merge branch '250403-szx-1017-shl' into test20250220
# Conflicts:
# src/views/courselibrary/CoursewareManage.vue
|
2025-04-03 11:07:41 +08:00 |
|
sunhonglai
|
1a667ac821
|
页面新增字段展示
|
2025-04-03 11:00:17 +08:00 |
|
joshen
|
10898f2c57
|
Merge branch '250321-bugfix-shl'
|
2025-03-26 16:58:05 +08:00 |
|
joshen
|
a9e630c340
|
Merge branch '250321-bugfix-shl' into test20250220
# Conflicts:
# src/views/courselibrary/CoursewareManage.vue
|
2025-03-26 09:36:12 +08:00 |
|
sunhonglai
|
fdc46fc704
|
项目删除学员增加source区分来源,开课ID
|
2025-03-25 15:11:28 +08:00 |
|
sunhonglai
|
7083772564
|
项目删除学员增加source区分来源,开课ID
|
2025-03-25 13:52:49 +08:00 |
|
joshen
|
6590e449be
|
作业
|
2025-03-24 21:06:19 +08:00 |
|
joshen
|
bce1358232
|
作业
|
2025-03-24 20:55:33 +08:00 |
|
joshen
|
d2fc065c6c
|
作业还原
|
2025-03-24 19:20:54 +08:00 |
|
joshen
|
0b8aa436fd
|
Merge remote-tracking branch 'yx/master_20250318-lyc'
|
2025-03-24 18:03:35 +08:00 |
|
670788339
|
d97e0947f9
|
删除作业
|
2025-03-24 17:57:05 +08:00 |
|
joshen
|
45c8c2bc87
|
Merge branch 'master_20250318-lyc' into master_1202
# Conflicts:
# src/views/courselibrary/CoursewareManage.vue
|
2025-03-24 16:56:10 +08:00 |
|
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
|
3181031a19
|
Merge branch '250213-prod-master_1202-gx' into master_1202
|
2025-03-20 20:26:23 +08:00 |
|
gengxin
|
f5e4d773b5
|
1. 回滚代码
|
2025-03-20 20:21:32 +08:00 |
|
joshen
|
e146fdd083
|
Merge branch '250213-prod-master_1202-gx' into master_1202
# Conflicts:
# src/views/courselibrary/CoursewareManage.vue
|
2025-03-20 17:51:06 +08:00 |
|
joshen
|
fd5cace839
|
Merge branch 'master_20250318-lyc' into master_1202
# Conflicts:
# src/views/courselibrary/CoursewareManage.vue
|
2025-03-20 17:18:42 +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 |
|