Commit Graph

3554 Commits

Author SHA1 Message Date
BOE\10867418
a727f5f937 Merge branch 'dongwu_develop' into develop 2023-03-21 17:13:20 +08:00
wyx
2fb750722a fix:版本号修改 2023-03-21 16:30:47 +08:00
wyx
d62f439f3b Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop 2023-03-21 16:29:14 +08:00
wyx
e8590a5872 style 2023-03-21 16:29:06 +08:00
yuping
547192e530 Merge remote-tracking branch 'origin/develop' into develop 2023-03-21 16:28:52 +08:00
yuping
21bd328806 --fix bug 2023-03-21 16:28:35 +08:00
wyx
0784750654 fix:开课名称重复显示问题 2023-03-21 16:00:06 +08:00
wyx
81970bf284 fix:作业成绩显示问题 2023-03-21 15:53:50 +08:00
yujicun
bd3b9ec181 Merge remote-tracking branch 'origin/develop' into develop 2023-03-21 15:37:28 +08:00
yuping
cfa27d3414 Merge remote-tracking branch 'origin/develop' into develop 2023-03-21 15:35:05 +08:00
yuping
91834a027c --fix bug 2023-03-21 15:34:56 +08:00
wyx
ac69aaf830 fix:面授课开课编辑及名称重复 2023-03-21 15:33:51 +08:00
yuping
40672cd53f --fix bug 2023-03-21 15:28:30 +08:00
BOE\10867418
92bf596380 Merge branch 'dongwu_develop' into develop 2023-03-21 14:50:35 +08:00
wyx
33d00f54e9 fix:面授课开课考试编辑问题 2023-03-21 14:27:52 +08:00
wyx
4f84fa68b6 style 2023-03-21 14:00:21 +08:00
wyx
43aba135ea style 2023-03-21 10:47:04 +08:00
wyx
bc1136255c style 2023-03-21 10:32:04 +08:00
BOE\10867418
aeab559fa2 Merge branch 'dongwu_develop' into develop 2023-03-21 09:18:20 +08:00
wyx
a4a669698e fix:修改版本号 2023-03-21 08:50:38 +08:00
yuping
0fbf1ad6cd --fix bug 2023-03-21 00:30:54 +08:00
yuping
9ed591b258 Merge remote-tracking branch 'origin/develop' into develop 2023-03-20 23:36:46 +08:00
yuping
4bf43cf4b7 --fix bug 2023-03-20 23:36:19 +08:00
wyx
b58343362e style:直播活动考勤样式 2023-03-20 18:57:32 +08:00
yuping
664f9f3dec Merge remote-tracking branch 'origin/develop' into develop 2023-03-20 18:54:48 +08:00
yuping
87b3ddc545 --fix bug 2023-03-20 18:54:36 +08:00
wyx
4eb3183b86 style:部分添加任务弹框大小调整 2023-03-20 17:59:17 +08:00
wyx
440b8129f6 fix:面授课催促学习-任务id修改 2023-03-20 17:35:20 +08:00
wyx
32e9a13390 fix:面授课催促学习-任务id修改 2023-03-20 17:32:48 +08:00
wyx
6575b33c66 fix:面授课新建开课附件上传、开课按钮重置问题修改 2023-03-20 17:16:09 +08:00
huangshengfa
9c271902c0 Merge branch 'boe_develop' into 'develop'
Boe develop

See merge request !97
2023-03-20 16:19:01 +08:00
BOE\10867418
6f62833c3a Merge branch 'dongwu_develop' into develop 2023-03-20 16:17:05 +08:00
wyx
99d3e25ba3 fix:修改版本号 2023-03-20 15:47:10 +08:00
wyx
351e0ae4e4 feat:增加面授课课程编号搜索功能 2023-03-20 15:17:17 +08:00
wyx
2439334726 fix:开课列表显示问题 2023-03-20 14:40:31 +08:00
huangshengfa
c540724331 Merge branch 'dev_Ma_pre' into 'develop'
result.data

See merge request !96
2023-03-20 14:16:20 +08:00
BOE\10867418
6ab0e14d13 result.data 2023-03-20 14:15:03 +08:00
huangshengfa
3e7d3a79be Merge branch 'dev_Ma_pre' into 'develop'
修改total请求

See merge request !95
2023-03-20 14:12:35 +08:00
BOE\10867418
b72f48a9c9 修改total请求 2023-03-20 14:11:41 +08:00
yuping
914c9318a5 Merge remote-tracking branch 'origin/develop' into develop 2023-03-20 14:08:44 +08:00
huangshengfa
fa0bc4cd98 Merge branch 'dev_Ma_pre' into 'develop'
打印状态

See merge request !94
2023-03-20 14:06:46 +08:00
BOE\10867418
06eda37317 打印状态 2023-03-20 14:05:22 +08:00
wyx
189feeeabd style 2023-03-20 13:58:50 +08:00
wyx
81904356e4 fix:添加面授课面授课列表接口更换 2023-03-20 13:55:05 +08:00
huangshengfa
b1892d5d00 Merge branch 'dev_Ma_pre' into 'develop'
执行顺序

See merge request !93
2023-03-20 13:52:03 +08:00
BOE\10867418
648be7ee18 执行顺序 2023-03-20 13:51:31 +08:00
huangshengfa
77db63f0e6 Merge branch 'dev_Ma_pre' into 'develop'
传入type

See merge request !92
2023-03-20 13:40:42 +08:00
BOE\10867418
d7e1b621fc 传入type 2023-03-20 13:39:49 +08:00
wyx
9bf1312230 style 2023-03-20 11:30:57 +08:00
wyx
36bf6fa9fe fix:面授管理-待审核增加撤回按钮,审核未通过增加编辑按钮。 2023-03-20 10:42:20 +08:00