Commit Graph

4587 Commits

Author SHA1 Message Date
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
李东进1
a09396ccf6 969 bug修复 2023-03-04 09:51:05 +08:00
dongruihua
53d948f076 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-04 09:28:54 +08:00
yuping
77aac9cdcf -- fix bug 2023-03-04 02:53:02 +08:00
yuping
ff6bd4907f Merge remote-tracking branch 'origin/develop' into develop 2023-03-03 23:06:07 +08:00
yuping
e69d0d442e -- fix bug 2023-03-03 23:05:46 +08:00
wyx
80778b87d9 style 2023-03-03 22:28:45 +08:00
caozc
733ec7b646 fix:【学习路径图-外部考试】导出数据无法正常导出,显示参数错误 2023-03-03 22:09:55 +08:00
caozc
95dc0daf11 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-03 22:08:41 +08:00
wyx
ef7fddd6e0 style:下载中心 2023-03-03 21:17:15 +08:00
wyx
bbfe70a895 style:评估管理 2023-03-03 21:10:15 +08:00
wyx
fb11f951d9 style:面授管理 2023-03-03 20:57:49 +08:00
lixg
5e5b280d95 feat:修改共享文档下载 2023-03-03 20:14:40 +08:00
caozc
2f64a6c0cf Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-03 19:50:20 +08:00
yuping
1d05a7ee7f Merge remote-tracking branch 'origin/develop' into develop 2023-03-03 19:23:32 +08:00
yuping
8b6e5201ce -- fix bug 2023-03-03 19:23:23 +08:00
wyx
d6cf2ee089 fix:项目阶段名称显示问题 2023-03-03 18:28:29 +08:00
wyx
c0d872b78d fix:添加考试不能重选试卷问题 2023-03-03 18:20:23 +08:00
wyx
9f5fee0473 fix:增加评估管理-创建人 创建时间 2023-03-03 18:04:45 +08:00
wyx
31129433b2 fix:面授课去考试白屏问题,试卷id字段传递修改 2023-03-03 17:48:38 +08:00
yuping
55b0c887b4 -- fix bug 2023-03-03 17:32:32 +08:00
yuping
676eb4c1e9 Merge remote-tracking branch 'origin/develop' into develop 2023-03-03 17:28:01 +08:00
yuping
78fd3a87b0 -- fix bug 2023-03-03 17:27:42 +08:00
wyx
3ef7a3ec4c fix:项目查看答卷 2023-03-03 16:51:58 +08:00
yuping
43435b0b41 -- fix bug 2023-03-03 16:50:07 +08:00
yuping
47b178324a Merge remote-tracking branch 'origin/develop' into develop 2023-03-03 15:50:54 +08:00
yuping
ff4f1a9d8c -- fix bug 2023-03-03 15:50:41 +08:00
dongruihua
5cdabd2193 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-03 15:34:18 +08:00
wyx
87a9b25339 style 2023-03-03 14:57:09 +08:00
wyx
43866dd142 style 2023-03-03 14:52:03 +08:00
huangshengfa
7d55f6fe7b Merge branch 'dev_m' into 'develop'
Dev m

See merge request !53
2023-03-03 14:51:43 +08:00
yuping
2af480c12a Merge remote-tracking branch 'origin/develop' into develop 2023-03-03 14:50:42 +08:00
yuping
d415b71f65 -- fix bug 2023-03-03 14:50:27 +08:00