Commit Graph

972 Commits

Author SHA1 Message Date
lixg
ce4cc38247 feat:合并 2022-12-03 08:30:43 +08:00
lixg
20d58c0ee4 feat:合并 2022-12-02 17:13:38 +08:00
lixg
835f2b9cab fix:修改版本号以及增加token失效退出登录 2022-12-02 17:13:18 +08:00
zhangyc
60c9d3d5df Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-02 17:04:49 +08:00
zhangyc
c246418ef4 面授课bug 2022-12-02 17:04:43 +08:00
lixg
faeaf69f27 feat:合并 2022-12-02 17:01:54 +08:00
lixg
11d21944df fix:修改bug 2022-12-02 17:01:30 +08:00
yuping
54031306de -- 项目创建修改 2022-12-02 16:24:42 +08:00
lixg
d42e3442c5 feat:合并 2022-12-02 15:08:12 +08:00
lixg
90051c0e62 fix:修改路径编辑回显 2022-12-02 15:07:19 +08:00
wuyx
746518bcb3 fix:添加分页,调整搜索参数错误 2022-12-02 15:05:19 +08:00
wuyx
ba20216f1a fix(BUG:63):学习路径图-编辑项目-Table表格回显字段修复。 2022-12-02 14:56:37 +08:00
lixg
be71d6b9fe feat:合并 2022-12-02 10:43:04 +08:00
lixg
c1842cd0e1 feat:合并 2022-12-02 10:01:48 +08:00
zhangyc
1078eaac89 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-01 22:19:41 +08:00
zhangyc
b24b0ce0d0 课程库上传附件 2022-12-01 22:19:36 +08:00
Ggysh-7
46edbee03d Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-01 21:27:09 +08:00
Ggysh-7
755a20b407 fix:编辑在线时不能选择原来的选项 2022-12-01 21:27:04 +08:00
zhangyc
f1e5288d5d Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-01 19:37:48 +08:00
zhangyc
3be7c9b06a 修复提交错误 2022-12-01 19:37:36 +08:00
yuping
52f1955eed Merge remote-tracking branch 'origin/develop' into develop 2022-12-01 18:58:48 +08:00
yuping
a57470855c -- bug 2022-12-01 18:58:38 +08:00
zhangyc
5cb507ed2f Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-01 18:56:47 +08:00
zhangyc
131294eb1a 课程库bug 2022-12-01 18:56:42 +08:00
yuping
d07321ddcd Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/components/drawers/AddDiscuss.vue
#	src/views/projectcenter/ProjectAdd.vue
2022-12-01 18:54:17 +08:00
yuping
13e9312069 -- bug 2022-12-01 18:50:41 +08:00
zhangyc
ef29a9ab7e Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-01 16:11:45 +08:00
zhangyc
d52e08444e 添加任务列表刷新问题 2022-12-01 16:11:41 +08:00
lixg
8ae00ef4ce fix:修改添加学员 2022-12-01 14:55:31 +08:00
lixg
bb84f0a026 feat:合并 2022-12-01 02:47:24 +08:00
lixg
61f253febe feat:合并 2022-12-01 02:46:33 +08:00
zhangyc
6be6404bc1 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-01 02:43:11 +08:00
zhangyc
a7eb3ccf66 直播bug 2022-12-01 02:40:47 +08:00
lixg
de6ff50569 feat:修改关卡书名 2022-12-01 02:39:02 +08:00
wuyx
ef0f55f198 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-01 02:38:08 +08:00
wuyx
6424c8d704 fix:修改投票编辑 2022-12-01 02:38:03 +08:00
yuping
07be52e211 -- bug 2022-12-01 02:23:32 +08:00
lixg
dbaae36e99 feat:合并 2022-12-01 01:57:10 +08:00
lixg
32983caf86 feat:修改授权 2022-12-01 01:56:41 +08:00
yuping
99ea3719f0 -- bug 2022-12-01 01:34:01 +08:00
yuping
0576b17231 -- 所属项目 2022-12-01 01:15:57 +08:00
yuping
e6b0be0fe9 -- 授课教师 2022-12-01 01:13:00 +08:00
yuping
0c0fc13972 -- 授课教师 2022-12-01 01:06:28 +08:00
yuping
829acf291a -- 任务 2022-12-01 00:38:47 +08:00
yuping
b60ac2a000 Merge remote-tracking branch 'origin/develop' into develop 2022-12-01 00:15:20 +08:00
yuping
72f4af241a Merge remote-tracking branch 'origin/develop' into develop 2022-12-01 00:14:40 +08:00
yuping
93318c5ed7 -- 任务 2022-12-01 00:14:24 +08:00
zhangyc
efc5fd55d5 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-01 00:13:29 +08:00
zhangyc
b8d33ae9d1 面授课时长 2022-12-01 00:13:25 +08:00
lixg
925e138dfc feat:合并 2022-11-30 23:54:51 +08:00