Commit Graph

3554 Commits

Author SHA1 Message Date
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
mx00085@163.com
ce4e1a28e5 feat: 员工学习数据新增导出全部 2023-03-03 14:49:18 +08:00
mx00085@163.com
92c07c476d feat: 员工学习数据新增导出全部 2023-03-03 14:45:22 +08:00
huangshengfa
27ffc888e4 Merge branch 'dev_m' into 'develop'
fix: 组织学习数据字段更改

See merge request !52
2023-03-03 14:37:15 +08:00
mx00085@163.com
106b8afad6 fix: 组织学习数据字段更改 2023-03-03 14:33:50 +08:00
wyx
99647d6c98 style:审核管理部分样式修改 2023-03-03 14:27:00 +08:00
yuping
e573cb6980 Merge remote-tracking branch 'origin/develop' into develop 2023-03-03 14:23:01 +08:00
yuping
f284dff0ec -- fix bug 2023-03-03 14:22:46 +08:00
wyx
e0c95dc063 fix:添加考试值未清空问题 2023-03-03 14:03:56 +08:00
yuping
90fdbd9234 -- fix bug 2023-03-03 13:53:52 +08:00
huangshengfa
0a79ff2f01 Merge branch 'dev_m' into 'develop'
fix: 授课时间格式化

See merge request !51
2023-03-03 13:53:25 +08:00
mx00085@163.com
7cd54e6afa fix: 授课时间格式化 2023-03-03 13:38:39 +08:00
yuping
f86b6773f0 Merge remote-tracking branch 'origin/develop' into develop 2023-03-03 12:41:56 +08:00
yuping
3e703c6c5a -- fix bug 2023-03-03 12:41:39 +08:00
lixg
49fa5ae375 feat:修改共享文档下载 2023-03-03 11:54:08 +08:00
peiqingliu
41b448abf2 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-03 11:26:39 +08:00
peiqingliu
630752547d 提交文档共享下载 2023-03-03 11:26:24 +08:00
lixg
cf7cd950c2 feat:合并 2023-03-03 10:50:54 +08:00
lixg
ffb469e80f feat:修改项目和学习路径二维码传参 2023-03-03 10:49:37 +08:00
dongruihua
38195f8c8c Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-03 09:32:58 +08:00
huangshengfa
d184fa0e3d Merge branch 'dev_m' into 'develop'
feat: 课程新增类型选项

See merge request !50
2023-03-03 09:13:16 +08:00
mx00085@163.com
f8ea57c62a feat: 课程新增类型选项 2023-03-03 09:05:59 +08:00
李东进1
1dc4270f8b 导出问题 2023-03-03 00:03:09 +08:00
李东进1
56b919cde6 导出问题 2023-03-02 23:07:58 +08:00
lpq
11086021f9 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-02 21:13:57 +08:00
lpq
4caedbff7c 共享文件下载 2023-03-02 21:13:43 +08:00
lixg
893cda5921 feat:修改面授课 2023-03-02 20:50:35 +08:00
lixg
af93a4b9c9 feat:合并 2023-03-02 19:05:04 +08:00
lixg
b5bcf54a4b feat:显示二维码 2023-03-02 19:04:46 +08:00
caozc
5cc9d89ae2 Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop 2023-03-02 18:10:34 +08:00
yuping
a9900bc66c -- fix bug 2023-03-02 16:59:23 +08:00
yuping
8f33a96e67 -- fix bug 2023-03-02 16:53:27 +08:00