Commit Graph

1405 Commits

Author SHA1 Message Date
yuping
a017b0ae38 Merge remote-tracking branch 'origin/develop' into develop 2022-12-05 01:40:54 +08:00
yuping
9720c48d62 --项目 学员 2022-12-05 01:40:39 +08:00
kclf
2e57c0c5ca Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-05 01:26:21 +08:00
kclf
14568127bf 部分修改 2022-12-05 01:26:17 +08:00
yuping
31721d0538 --项目 开课学员 2022-12-05 00:36:49 +08:00
yuping
a26bc18843 Merge remote-tracking branch 'origin/develop' into develop 2022-12-05 00:12:39 +08:00
yuping
93ad2e4f71 --项目 分页不对问题 2022-12-05 00:12:32 +08:00
lixg
a70f1761ae feat:合并 2022-12-05 00:00:52 +08:00
lixg
7260014535 fix:修改小组 2022-12-04 23:53:02 +08:00
yuping
e7091b04e6 Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 23:49:28 +08:00
yuping
0cd7deb812 --项目 项目名称问题 2022-12-04 23:49:20 +08:00
wyx
1e52f94b28 fix:修改课程管理/课程审核创建时间问题 2022-12-04 23:07:31 +08:00
wyx
bd48789860 fix:面授保存后附件清空 2022-12-04 22:29:30 +08:00
wyx
d29bc18d40 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-04 22:05:43 +08:00
wyx
2388abdedf fix:修复编辑任务后再次点击添加任务都是编辑任务的问题 2022-12-04 22:05:37 +08:00
yuping
c32d38c9e1 Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 21:39:03 +08:00
yuping
1630d9bddc --项目 bug 2022-12-04 21:38:25 +08:00
wyx
0c30aa7371 fix:添加在线课分页 2022-12-04 21:38:16 +08:00
yuping
23cea57012 Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 21:36:27 +08:00
yuping
eb94c0feee --项目 学员列表 2022-12-04 21:36:13 +08:00
lixg
a808aebeac feat:hebing 2022-12-04 21:32:53 +08:00
lixg
7fe200005b feat:合并 2022-12-04 21:32:30 +08:00
yuping
9ab9006fa2 --项目 学员列表 2022-12-04 21:30:19 +08:00
lixg
956924f40a feat:增加小组添加学员 2022-12-04 21:29:00 +08:00
yuping
ea0e4dd2f1 Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 20:07:53 +08:00
yuping
5f9c997189 --项目 学员列表 2022-12-04 20:06:23 +08:00
kclf
3fd9632adc Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2022-12-04 20:06:21 +08:00
kclf
2c4e6c08ff t 2022-12-04 20:06:18 +08:00
zhangyc
dc4876e2c9 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-04 20:05:52 +08:00
zhangyc
3649771664 直播500 2022-12-04 20:04:55 +08:00
yuping
ae42180f2a Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 19:47:00 +08:00
yuping
ef0927c80a --项目 学员列表 2022-12-04 19:45:05 +08:00
lixg
a19b87299f feat:合并 2022-12-04 18:29:38 +08:00
lixg
5a166c4bfc fix:修改小组 2022-12-04 18:26:37 +08:00
yuping
b77ddca145 --项目 阶段修改 2022-12-04 18:00:49 +08:00
yuping
2f8cbe06f1 Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 17:57:30 +08:00
yuping
ed085eeaad --项目 阶段修改 2022-12-04 17:56:45 +08:00
wyx
be4d0a98b8 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-04 17:54:36 +08:00
wyx
244f585580 fix:修改模板库查看报错问题 2022-12-04 17:54:30 +08:00
yuping
f7ca9939be --项目 阶段修改 2022-12-04 17:54:28 +08:00
yuping
de10a2281d Merge remote-tracking branch 'origin/develop' into develop 2022-12-04 17:52:08 +08:00
yuping
a09bbd6fde --项目 阶段修改 2022-12-04 17:51:53 +08:00
zhangyc
40c13461fb Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-04 17:32:25 +08:00
wyx
39ad9b06da style:隐藏取消确定操作 2022-12-04 17:31:02 +08:00
zhangyc
ad883eabe8 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2022-12-04 17:30:26 +08:00
wyx
d4a36e2bb6 style:增加面授课查看弹框 2022-12-04 17:28:14 +08:00
wyx
52d6e24410 fix:学习路径图共享文档功能 2022-12-04 17:02:16 +08:00
wyx
b854ea028b fix:增加已审核项目所属项目审核说明字段展示 2022-12-04 16:48:14 +08:00
zhangyc
02b15ea14a 限制任务字数 2022-12-04 16:35:58 +08:00
yuping
a38ca44e6f Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/TaskAdd.vue
#	src/views/projectcenter/TaskPage.vue
2022-12-04 15:09:21 +08:00