Commit Graph

4369 Commits

Author SHA1 Message Date
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
dongruihua
4df39e33e8 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-01 08:57:06 +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
lixg
e96773ba23 feat:修改学习路径删除 2022-11-30 23:53:23 +08:00
yuping
665474ef89 -- 任务 2022-11-30 23:45:51 +08:00
yuping
650f86e222 -- 任务 2022-11-30 23:45:16 +08:00
yuping
a0f563d68e -- 任务 2022-11-30 23:44:28 +08:00
yuping
cb88683a8d Merge remote-tracking branch 'origin/develop' into develop 2022-11-30 23:44:10 +08:00
yuping
d6f3e56de3 -- 任务 2022-11-30 23:44:01 +08:00
wuyx
7b43915de4 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-11-30 23:43:53 +08:00
yuping
96bffbaa82 -- 任务 2022-11-30 23:42:17 +08:00
yuping
e3b5aa9546 -- 任务 2022-11-30 23:41:47 +08:00
wuyx
30853d080e Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-11-30 23:41:39 +08:00
yuping
4e7f47034f -- 任务 2022-11-30 23:41:37 +08:00
wuyx
eb1721d263 fix:修改投票信息获取接口问题 2022-11-30 23:41:35 +08:00
yuping
b3ad99bb4d Merge remote-tracking branch 'origin/develop' into develop 2022-11-30 23:35:11 +08:00
yuping
27403d149f -- 任务 2022-11-30 23:34:54 +08:00
Ggysh-7
2ebd6a250e Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-11-30 23:34:38 +08:00
Ggysh-7
aaeb213cba fix:添加作业通过创建作业信息接口给后端传参(上传文件的链接信息参数) 2022-11-30 23:34:30 +08:00
wuyx
d79b5126d3 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-11-30 23:33:32 +08:00
wuyx
d110b8f0ed fix:修改投票信息不显示问题 2022-11-30 23:33:24 +08:00
zhangyc
e93d7bea99 案例、作业、直播bugMerge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-11-30 23:31:34 +08:00