Commit Graph

4011 Commits

Author SHA1 Message Date
lpq
0231a33572 解决冲突 2023-02-19 20:29:38 +08:00
lixg
3e84518fc6 feat:合并 2023-02-19 20:06:24 +08:00
lixg
ab58e4e7fe feat:修改任务管理二维码 2023-02-19 20:05:05 +08:00
lpq
c1241a7455 提交 2023-02-19 20:02:48 +08:00
lpq
651a182641 提交导出 2023-02-19 20:01:29 +08:00
李东进1
aa76caecde bug修复 2023-02-19 19:52:13 +08:00
yuping
417a54f56b fix bug 2023-02-19 18:26:34 +08:00
yuping
d0d7eb7dcf fix bug 2023-02-19 18:23:12 +08:00
lixg
7d7c939619 feat:合并 2023-02-19 17:54:32 +08:00
lixg
be29458b74 feat:过滤未发布的评估 2023-02-19 17:54:04 +08:00
yuping
edd9573936 fix bug 2023-02-19 16:37:07 +08:00
yuping
4a54a923a4 fix bug 2023-02-19 16:01:42 +08:00
yuping
93a5f3838d Merge remote-tracking branch 'origin/develop' into develop 2023-02-19 16:01:09 +08:00
yuping
ecacb0c980 fix bug 2023-02-19 16:00:54 +08:00
lixg
9f1b56ca1d feat:合并 2023-02-19 15:53:03 +08:00
lixg
1bccb2c6e9 feat:修改考试在线二维码 2023-02-19 15:43:27 +08:00
李东进1
0f14ed29ae BUG 学习路径下 学员列表 查看页面数据 没出来(之前是好的) 2023-02-19 13:44:23 +08:00
lpq
b1c4b80be3 计算签到时间 2023-02-19 13:38:30 +08:00
wyx
f48145eb5b fix 2023-02-19 12:25:53 +08:00
wyx
79f929202e fix:修改项目外部考试学员管理列表参数查询 2023-02-19 12:04:34 +08:00
wyx
e92fdf1b69 fix:系统外部考试区分,外部考试管理学员列表查询参数修改 2023-02-19 11:59:17 +08:00
wyx
f2c54e57ca fix:增加考试导出参数targetid 2023-02-19 10:14:41 +08:00
wyx
ed539fef71 fix:修改项目投票导出数据参数 2023-02-19 09:49:35 +08:00
wyx
f17541095a fix:修改投票导出问题,修改投票状态 2023-02-19 09:32:23 +08:00
lpq
c3a1bb19cf Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-19 01:40:24 +08:00
lpq
018032bfa3 投票导出 2023-02-19 01:39:58 +08:00
yuping
0382af8507 Merge remote-tracking branch 'origin/develop' into develop 2023-02-19 01:19:33 +08:00
yuping
75fa07aa98 fix bug 2023-02-19 01:19:16 +08:00
李东进1
ddb970cdca bug修复 2023-02-19 01:13:30 +08:00
lpq
20aa37fe5f 导出 2023-02-19 00:50:07 +08:00
wyx
c7e5cf0488 fix:系统考试工号显示修改 2023-02-19 00:26:30 +08:00
wyx
454a9335ee fix:作业导出参数问题修改 2023-02-19 00:24:47 +08:00
lpq
cdf34e75b8 提交签到 2023-02-18 23:50:37 +08:00
李东进1
20d2c78f29 前端bug 2023-02-18 23:05:49 +08:00
lpq
2ec1f206ca 完成活动页面学员列表数据缺失 2023-02-18 22:01:42 +08:00
lpq
d222853ec7 Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-02-18 20:21:22 +08:00
lpq
3e0cc37ba4 批量换组 2023-02-18 20:21:04 +08:00
李东进1
1739f9a18b BUG 课程库下 1、面授课列表 里 学习人数 = 该面授课所有开课的学员数总和 再去重 2、面授课列表里 是否停用列 有的是-1 2023-02-18 19:31:57 +08:00
yuping
f63b5446d3 Merge remote-tracking branch 'origin/develop' into develop 2023-02-18 19:30:01 +08:00
yuping
8f579fd2d3 demand 在线课对接 2023-02-18 19:29:50 +08:00
wangjuan
9bec372871 取消默认阶段以及题干问题 2023-02-18 19:26:07 +08:00
yuping
a9b1dcd19b demand 在线课对接 2023-02-18 19:21:42 +08:00
yuping
466a1f1127 Merge remote-tracking branch 'origin/develop' into develop 2023-02-18 18:58:20 +08:00
yuping
2dd7db7a2e demand 在线课对接 2023-02-18 18:58:11 +08:00
李东进1
e80c05b718 BUG 添加直播任务 封面不显示、回放链接文本框没了 2023-02-18 17:54:54 +08:00
wangjuan
b965206cec 图标隐藏 2023-02-18 13:53:18 +08:00
yuping
136642eb4e --fix bug 2023-02-18 13:16:06 +08:00
yuping
67e98b73d8 Merge remote-tracking branch 'origin/develop' into develop 2023-02-18 13:03:34 +08:00
yuping
96ead61f03 --fix bug 2023-02-18 13:03:18 +08:00
wyx
2a790462f8 fix:学员进度排行取值修改 2023-02-18 12:01:50 +08:00