Commit Graph

4369 Commits

Author SHA1 Message Date
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
lpq
965010ace1 讨论导出 2023-03-04 19:16:54 +08:00
李东进1
9ddf4386b1 长度校验 2023-03-04 18:38:19 +08:00
huangshengfa
87317b60df Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !55
2023-03-04 17:02:19 +08:00
huangshengfa
ec074e6108 Merge branch 'manage-release' into 'release'
Manage release

See merge request !54
2023-03-04 15:26:01 +08:00
yuping
bca4d645c4 Merge remote-tracking branch 'origin/develop' into manage-release 2023-03-04 15:17:37 +08:00
yuping
88bbc99c97 -- fix bug 2023-03-04 14:48:36 +08:00
yuping
69e84fbbc3 -- fix bug 2023-03-04 14:47:28 +08:00
yuping
70d774d535 Merge remote-tracking branch 'origin/develop' into develop 2023-03-04 14:24:55 +08:00
yuping
2c9bf37df4 -- fix bug 2023-03-04 14:24:40 +08:00
lpq
7f7e271eaa Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-04 14:20:29 +08:00
lpq
142c1d8977 合并冲突 2023-03-04 14:20:16 +08:00
yuping
41bb1d4e03 Merge remote-tracking branch 'origin/develop' into develop 2023-03-04 14:18:21 +08:00
yuping
96f837a1d8 -- fix bug 2023-03-04 14:17:48 +08:00
wyx
62a0600a8a style:查看投票弹框层级显示问题 2023-03-04 13:31:31 +08:00
wyx
fe57676318 fix:查看头片显示 2023-03-04 13:15:16 +08:00
lixg
1a5e54db1c feat:合并 2023-03-04 11:46:53 +08:00
lixg
733c47ea64 feat:修改阶段名称显示 2023-03-04 11:46:22 +08:00
wyx
8a2159d1be fix:查看投票、查看试卷问题修改 2023-03-04 11:45:49 +08:00