Commit Graph

4369 Commits

Author SHA1 Message Date
wyx
8de5896eee Merge branch 'develop' into manage-release 2023-03-07 18:05:11 +08:00
wyx
07b5f9d6bc fix:项目撤回结束 2023-03-07 18:04:55 +08:00
huangshengfa
45dfb20d38 Merge branch 'pre-release' into 'release'
Pre release

See merge request !59
2023-03-07 18:03:45 +08:00
wyx
e84805517c fix:修改版本号 2023-03-07 17:57:45 +08:00
wyx
ad1ced6ae9 Merge branch 'develop' into manage-release 2023-03-07 17:57:14 +08:00
lixg
5d8f12fca2 feat:合并 2023-03-07 17:48:44 +08:00
lixg
9c4510b7e3 feat:修改面授课 2023-03-07 17:48:20 +08:00
yuping
e3cec35d86 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	src/views/projectcenter/TaskPage.vue
2023-03-07 17:46:05 +08:00
yuping
164f30c793 -- fix bug 2023-03-07 17:43:51 +08:00
wyx
aeef3f9725 fix:学习路径图列表已发布路径不允许编辑 2023-03-07 17:38:42 +08:00
wyx
8c8db9e08f fix:项目共享文档 2023-03-07 17:26:26 +08:00
peiqingliu
5c962b4009 修改组长导入 2023-03-07 16:48:43 +08:00
wyx
63eafe934b feat:增加教师入口跳转链接 2023-03-07 16:07:10 +08:00
yuping
bec0b6e817 Merge remote-tracking branch 'origin/develop' into develop 2023-03-07 15:47:22 +08:00
yuping
7b544f9acf -- fix bug 2023-03-07 15:47:09 +08:00
lixg
eaefc4ebd7 feat:修改导航 2023-03-07 12:56:27 +08:00
peiqingliu
7bef214bd6 编辑小组时,接口超时 2023-03-07 11:04:23 +08:00
huangshengfa
fb76fe6471 Merge branch 'pre-release' into 'release'
Pre release

See merge request !58
2023-03-07 09:29:55 +08:00
dongruihua
8bd0d07041 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-07 09:21:04 +08:00
wyx
36788462da fix:修改版本号 2023-03-07 02:01:04 +08:00
wyx
49f0cdbaff Merge branch 'develop' into manage-release 2023-03-07 02:00:27 +08:00
caozc
9336956cb1 update:面授课修改 2023-03-07 01:24:16 +08:00
lpq
a2c90463c0 去除掉多余的debugger 2023-03-07 00:34:10 +08:00
李东进1
15ca25783b 1042bug修复 2023-03-06 23:03:50 +08:00
lpq
db74f05e94 小组进度四舍五入 2023-03-06 22:38:45 +08:00
wyx
1ff3299b52 fix:签到二维码扫码参数传递修改 2023-03-06 21:31:32 +08:00
lpq
a8f8ecd26d 小组名称长省略号显示 2023-03-06 21:18:20 +08:00
wyx
77b635285d fix:外部考试说明字段保存问题 2023-03-06 17:01:10 +08:00
yuping
dd79916c7f -- fix bug 2023-03-06 16:52:12 +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
dongruihua
3792ef3478 Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 2023-03-06 15:05:44 +08:00
wyx
d9a9a24f69 fix:修改版本号 2023-03-06 14:20:07 +08:00
wyx
fdddc896c9 Merge branch 'develop' into manage-release 2023-03-06 14:19:29 +08:00
yuping
0d69b5cc2c -- fix bug 2023-03-06 12:53:05 +08:00
yuping
642246e721 -- fix bug 2023-03-06 12:43:06 +08:00
yuping
99ebcbff87 Merge remote-tracking branch 'origin/develop' into develop 2023-03-06 12:31:43 +08:00
yuping
ae685f7de5 -- fix bug 2023-03-06 12:31:28 +08:00
wyx
e60256ccad fix:共享文档按钮显示问题 2023-03-06 11:10:23 +08:00
dongruihua
9cfebda718 Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 2023-03-06 09:38:54 +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
wyx
87d2e61c16 fix:修改版本号 2023-03-06 08:41:32 +08:00
wyx
e999cb7b18 Merge branch 'develop' into manage-release 2023-03-06 08:40:51 +08:00
yuping
b3c86ffecb -- fix bug 2023-03-06 02:21:05 +08:00
yuping
9a0fa22851 Merge remote-tracking branch 'origin/develop' into develop 2023-03-06 02:17:42 +08:00
yuping
20b23b1518 -- fix bug 2023-03-06 02:17:29 +08:00
caozc
9acaa3a377 fix:解决拒绝不显示按钮 2023-03-06 02:10:48 +08:00
yuping
0ee463f7d1 Merge remote-tracking branch 'origin/develop' into develop 2023-03-06 00:58:13 +08:00
yuping
ff2dcea0ce -- fix bug 2023-03-06 00:57:59 +08:00
lpq
d848050886 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-06 00:31:10 +08:00
lpq
fea2f8219c 防止多次点击确定按钮 2023-03-06 00:30:57 +08:00