Commit Graph

4587 Commits

Author SHA1 Message Date
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
caozc
5abad571c7 fix:重置按钮 2023-03-05 23:31:04 +08:00
lixg
43748455af feat:合并 2023-03-05 22:12:07 +08:00
lixg
85349afbfc feat:修改upload 2023-03-05 22:11:38 +08:00
yuping
6d6f3c14b2 Merge remote-tracking branch 'origin/develop' into develop 2023-03-05 21:44:26 +08:00
yuping
4fbeb88422 -- fix bug 2023-03-05 21:44:14 +08:00
wyx
7deebe30ab fix:共享文档上传地址问题 2023-03-05 21:21:09 +08:00
wyx
3a8686ee52 fix:左侧导航菜单重复 2023-03-05 20:53:49 +08:00
huangshengfa
96e09eb142 Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !57
2023-03-05 17:00:40 +08:00
yuping
e2094a397f -- fix bug 路径图名称校验 2023-03-05 16:53:08 +08:00
yuping
a41b583676 -- fix bug 路径图名称校验 2023-03-05 16:42:39 +08:00
yuping
abee0b773c Merge remote-tracking branch 'origin/develop' into develop 2023-03-05 16:40:40 +08:00
yuping
970fe5a42c -- fix bug 路径图名称校验 2023-03-05 16:40:32 +08:00
wyx
f31dbf6c6d dix:面授课开课点击重置列表消失问题 2023-03-05 16:22:50 +08:00
lixg
3c138aa3b8 feat:修改在线课及考试h5的灰测地址 2023-03-05 16:11:33 +08:00
huangshengfa
1c6a3c4d1a Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !56
2023-03-05 16:03:06 +08:00
lixg
2e3a721098 feaT:合并 2023-03-05 15:42:47 +08:00
lixg
73a4005174 feat:修改h5地址 2023-03-05 15:42:19 +08:00
yuping
e7f74953f8 Merge remote-tracking branch 'origin/develop' into develop 2023-03-05 15:41:47 +08:00
yuping
9a0ed7cdc9 -- fix bug 外部考试 2023-03-05 15:41:32 +08:00
wyx
ad051036d1 fix:系统考试未发布时允许修改信息 2023-03-05 14:53:18 +08:00
lpq
8afb42e242 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-05 14:51:47 +08:00
lpq
d442b9579e 修复删除学员报错 2023-03-05 14:51:35 +08:00
yuping
93a5b6ee55 -- fix bug 外部考试 2023-03-05 14:08:48 +08:00
dongruihua
55db72848d Merge branch 'manage-release' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into release 2023-03-05 09:58:56 +08:00
dongruihua
5b580238bf Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-05 09:46:57 +08:00
wyx
0d0bb0739e fix:合并冲突 2023-03-05 08:42:39 +08:00
wyx
f58a1708d1 fix:修改版本号 2023-03-05 08:39:48 +08:00
wyx
a0b7d5ec7b Merge branch 'develop' into manage-release 2023-03-05 08:38:27 +08:00
yuping
940f17d7ec Merge remote-tracking branch 'origin/develop' into develop 2023-03-05 02:40:29 +08:00
yuping
c2c7e6a5c3 -- fix bug 外部考试 2023-03-05 02:40:17 +08:00
caozc
2636f5cbcd fix: type=2 学习路径 2023-03-04 22:42:52 +08:00
lixg
f73a86b777 feat:修改评估状态 2023-03-04 20:28:10 +08:00