Pengxiansen
|
5dc774f312
|
提交
|
2025-02-20 16:36:25 +08:00 |
|
joshen
|
546c6c917a
|
Merge remote-tracking branch 'yx/compulsory_professional_skills_test' into master_1202
# Conflicts:
# src/api/request.js
|
2025-02-18 18:06:32 +08:00 |
|
Pengxiansen
|
4ca65ea584
|
提交
|
2025-02-13 17:33:57 +08:00 |
|
Pengxiansen
|
77df66c2f4
|
增加专业力必修模块
|
2025-01-23 15:03:36 +08:00 |
|
Pengxiansen
|
2b2d8aa377
|
专业力必修提交
|
2025-01-21 11:17:43 +08:00 |
|
zhangsir
|
2e1b057f62
|
讲师管理权限
|
2025-01-13 14:46:14 +08:00 |
|
liu
|
d026a86ee5
|
添加专业力模块
|
2025-01-13 09:25:47 +08:00 |
|
zhangsir
|
e43269b101
|
讲师管理bug
|
2025-01-10 14:01:32 +08:00 |
|
nisen
|
c02b8d7a8d
|
补交文件
|
2024-09-27 17:44:16 +08:00 |
|
nisen
|
fac0a060e4
|
回退
|
2024-09-05 15:31:50 +08:00 |
|
zhangsir
|
4e4f120eb3
|
学院导出删除多余打印,联调完毕
|
2024-07-30 09:54:37 +08:00 |
|
zhangsir
|
ec95836cf5
|
学院导出接口联调
|
2024-07-30 09:29:59 +08:00 |
|
joshen
|
359cbabf9c
|
Merge branch 'zcwy0524' into 'master'
Zcwy0524
See merge request !181
|
2024-06-03 18:31:47 +08:00 |
|
joshen
|
4d3a54c15f
|
tranningManager down loading add
|
2024-05-24 23:39:11 +08:00 |
|
zhangsir
|
b6f36e7955
|
Merge branch 'zcwy-0511-out' into zcwy-0520-out
# Conflicts:
# src/components/NavLeft.vue
|
2024-05-20 10:38:28 +08:00 |
|
zhangsir
|
363ee432fd
|
修改页面显示
|
2024-05-15 11:41:40 +08:00 |
|
zhangsir
|
50b154d470
|
Merge branch 'zcwy-0511-out' into dev0223
|
2024-05-14 19:23:56 +08:00 |
|
zhangsir
|
095f661918
|
左侧列表权限受控,修改备注
|
2024-05-13 19:00:32 +08:00 |
|
zhangsir
|
f58ae089f2
|
讲师认证
|
2024-05-11 21:52:29 +08:00 |
|
zhangsir
|
54378fbf34
|
测评上传整体修改
|
2024-04-15 20:43:51 +08:00 |
|
yuping
|
0e8341f980
|
接口调整
|
2023-07-02 18:21:27 +08:00 |
|
wyx
|
251b3179f7
|
style
|
2023-04-07 14:53:02 +08:00 |
|
BOE\10867418
|
94522bd798
|
Merge branch 'dongwu_develop' into develop
|
2023-03-27 09:04:33 +08:00 |
|
yuping
|
8307259dcb
|
--fix bug 概览
|
2023-03-26 19:09:59 +08:00 |
|
BOE\10867418
|
3b3110330e
|
Merge branch 'dongwu_develop' into develop
|
2023-03-24 17:05:36 +08:00 |
|
yuping
|
7b98178e34
|
--fix bug 添加学员异步加载刷新
|
2023-03-24 16:53:11 +08:00 |
|
BOE\10867418
|
6f62833c3a
|
Merge branch 'dongwu_develop' into develop
|
2023-03-20 16:17:05 +08:00 |
|
yuping
|
58758da4e9
|
--fix bug
|
2023-03-18 13:57:02 +08:00 |
|
yuping
|
63ea5b3862
|
--fix bug 重复数据
|
2023-03-18 13:30:50 +08:00 |
|
yuping
|
7e391e6145
|
--fix bug 重复数据
|
2023-03-18 13:15:58 +08:00 |
|
dongruihua
|
ac618dd084
|
Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
# Conflicts:
# src/App.vue
|
2023-03-17 10:54:49 +08:00 |
|
yuping
|
e68aeb246b
|
--demand 面授课
|
2023-03-17 03:08:28 +08:00 |
|
wyx
|
fa431338c8
|
style:新版面授课界面添加
|
2023-03-14 18:50:18 +08:00 |
|
yujicun
|
8470b42cfb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-03-10 18:07:17 +08:00 |
|
yuping
|
fa33f4f9de
|
-- fix 项目权限
|
2023-03-10 15:56:29 +08:00 |
|
yuping
|
3e61619930
|
-- fix bug
|
2023-03-09 17:44:08 +08:00 |
|
huangshengfa
|
340b5e784b
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !73
|
2023-03-09 16:23:14 +08:00 |
|
yuping
|
686ea06697
|
-- fix 在线课重复
|
2023-03-09 13:21:28 +08:00 |
|
yuping
|
b99485cdd2
|
-- fix 在线课重复
|
2023-03-09 13:20:02 +08:00 |
|
huangshengfa
|
fa1d2c2ad3
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !69
|
2023-03-09 08:44:34 +08:00 |
|
wyx
|
eab1292e38
|
style
|
2023-03-08 19:05:58 +08:00 |
|
huangshengfa
|
683f74a7a0
|
Merge branch 'develop' into 'pre-dev'
# Conflicts:
# src/components/NavLeft.vue
|
2023-03-07 18:10:11 +08:00 |
|
yuping
|
7b544f9acf
|
-- fix bug
|
2023-03-07 15:47:09 +08:00 |
|
dongruihua
|
87a4ba7502
|
Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
|
2023-03-06 15:11:08 +08:00 |
|
yuping
|
ae685f7de5
|
-- fix bug
|
2023-03-06 12:31:28 +08:00 |
|
dongruihua
|
cc09605e04
|
Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
|
2023-03-06 09:16:37 +08:00 |
|
yuping
|
20b23b1518
|
-- fix bug
|
2023-03-06 02:17:29 +08:00 |
|
dongruihua
|
53d948f076
|
Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop
|
2023-03-04 09:28:54 +08:00 |
|
yuping
|
77aac9cdcf
|
-- fix bug
|
2023-03-04 02:53:02 +08:00 |
|
huangshengfa
|
5ac2e40633
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !44
|
2023-02-28 09:02:53 +08:00 |
|