huangshengfa
|
b2acbf714c
|
Merge branch 'master' into 'pre-master'
# Conflicts:
# .env.prod
|
2023-03-09 18:35:02 +08:00 |
|
wyx
|
c8d6b292f5
|
Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage
|
2023-03-09 18:19:34 +08:00 |
|
wyx
|
78cf186b9e
|
fix:修改版本号
|
2023-03-09 18:19:05 +08:00 |
|
yuping
|
e976b9e870
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/App.vue
|
2023-03-09 18:11:37 +08:00 |
|
yuping
|
bf4f13f10f
|
-- fix 版本号
|
2023-03-09 18:11:10 +08:00 |
|
wyx
|
40f8fb222d
|
fix:修改版本号
|
2023-03-09 18:07:23 +08:00 |
|
yuping
|
16fbc110df
|
Merge remote-tracking branch 'origin/manage-release'
# Conflicts:
# src/App.vue
|
2023-03-09 18:02:25 +08:00 |
|
yuping
|
2f27fb361d
|
Merge branch 'develop' into manage-release
|
2023-03-09 18:01:39 +08:00 |
|
yuping
|
776d525da6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-03-09 17:44:17 +08:00 |
|
yuping
|
3e61619930
|
-- fix bug
|
2023-03-09 17:44:08 +08:00 |
|
huangshengfa
|
19f4ae258d
|
Merge branch 'pre-release' into 'release'
Pre release
See merge request !74
|
2023-03-09 16:23:30 +08:00 |
|
huangshengfa
|
340b5e784b
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !73
|
2023-03-09 16:23:14 +08:00 |
|
mx00085@163.com
|
6b073227bb
|
fix: 按钮修改
|
2023-03-09 16:16:27 +08:00 |
|
wyx
|
7de159409d
|
fix:修改版本号
|
2023-03-09 16:10:32 +08:00 |
|
wyx
|
85644f44f3
|
Merge branch 'develop' into manage-release
|
2023-03-09 16:09:49 +08:00 |
|
mx00085@163.com
|
dd76f32361
|
Merge branch 'develop' of http://10.251.129.121/boeu/fe-manage into dev_m
|
2023-03-09 15:55:46 +08:00 |
|
mx00085@163.com
|
4514db4b10
|
fix: token设置
|
2023-03-09 15:50:13 +08:00 |
|
wyx
|
fb8d1aab0b
|
style
|
2023-03-09 15:29:37 +08:00 |
|
yuping
|
6a00d11288
|
-- fix 导出bug
|
2023-03-09 15:04:59 +08:00 |
|
yuping
|
ab11d3364f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-03-09 15:04:28 +08:00 |
|
yuping
|
f29396e34c
|
-- fix 导出bug
|
2023-03-09 15:04:11 +08:00 |
|
wyx
|
dc4f18e73e
|
style
|
2023-03-09 14:23:04 +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
|
361d9b9e29
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !71
|
2023-03-09 13:18:15 +08:00 |
|
huangshengfa
|
74c87e2536
|
Merge branch 'pre-release' into 'release'
Pre release
See merge request !70
|
2023-03-09 13:18:00 +08:00 |
|
wyx
|
4c2d010403
|
fix:修改版本号
|
2023-03-09 12:18:06 +08:00 |
|
wyx
|
a9b027aabd
|
Merge branch 'develop' into manage-release
|
2023-03-09 12:17:33 +08:00 |
|
wyx
|
2b013ed9e3
|
style
|
2023-03-09 11:54:16 +08:00 |
|
wyx
|
8f7a481895
|
fix:面授课开课编辑-提示名称重复问题修改
|
2023-03-09 11:23:46 +08:00 |
|
wyx
|
6df69fca47
|
fix:已发布面授课显示开课按钮
|
2023-03-09 11:00:33 +08:00 |
|
huangshengfa
|
fa1d2c2ad3
|
Merge branch 'pre-dev' into 'develop'
Pre dev
See merge request !69
|
2023-03-09 08:44:34 +08:00 |
|
huangshengfa
|
f312123f6d
|
Merge branch 'pre-release' into 'release'
Pre release
See merge request !68
|
2023-03-09 08:44:08 +08:00 |
|
wyx
|
3cc129471a
|
Merge branch 'develop' into manage-release
|
2023-03-09 07:53:20 +08:00 |
|
yuping
|
ac50f5bea4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2023-03-09 00:55:09 +08:00 |
|
yuping
|
c8dbc48609
|
-- fix 在线课重复
|
2023-03-09 00:54:48 +08:00 |
|
wyx
|
5c6a0fe828
|
Merge branch 'develop' into manage-release
|
2023-03-09 00:42:14 +08:00 |
|
lixg
|
43b1846706
|
feat:合并
|
2023-03-09 00:22:34 +08:00 |
|
lixg
|
909edbbbdd
|
feat:修改评估复制
|
2023-03-09 00:22:07 +08:00 |
|
李东进1
|
2151b091f9
|
update
|
2023-03-09 00:14:06 +08:00 |
|
lixg
|
4513749368
|
feat:合并
|
2023-03-09 00:03:00 +08:00 |
|
lixg
|
12b3cf33e9
|
feat:修改复制传参
|
2023-03-09 00:02:29 +08:00 |
|
lpq
|
55e721f602
|
学员添加判断
|
2023-03-08 23:59:42 +08:00 |
|
lixg
|
fc1d2dde68
|
feat:合并
|
2023-03-08 23:28:14 +08:00 |
|
lixg
|
093d8f0de4
|
feat:修改复制参数
|
2023-03-08 23:27:45 +08:00 |
|
wyx
|
003c3b0e00
|
fix:评估管理-单选题-多选题-问答题-评分提编辑删除选项保存修改bug修复
|
2023-03-08 23:25:01 +08:00 |
|
lpq
|
06875c82fb
|
去掉多余的debugger
|
2023-03-08 22:18:18 +08:00 |
|
wyx
|
914094e228
|
fix:修改版本号
|
2023-03-08 22:14:29 +08:00 |
|
wyx
|
3d224974e7
|
Merge branch 'develop' into manage-release
|
2023-03-08 22:14:06 +08:00 |
|
wyx
|
4ccaf34d49
|
fix:评估管理评估编辑问题
|
2023-03-08 21:59:42 +08:00 |
|