Commit Graph

3698 Commits

Author SHA1 Message Date
huangshengfa
5088ac6a75 Merge branch 'dev_Ma_pre' into 'develop'
修改父级状态

See merge request !89
2023-03-16 09:52:26 +08:00
BOE\10867418
ac9447c7e3 父级状态 2023-03-16 09:51:36 +08:00
BOE\10867418
0d284d01cd 状态 2023-03-15 19:31:40 +08:00
wyx
48498b448f fix:面授课操作-slot的切换数据不刷新问题 2023-03-15 18:32:12 +08:00
wyx
03c8b30539 fix:编辑面授课附件上传问题 2023-03-15 18:11:59 +08:00
wyx
c6d649b0ae fix:面授课已发布隐藏删除按钮 2023-03-15 18:00:35 +08:00
wyx
849256f4c6 feat:增加登录的returnUrl 2023-03-15 17:46:28 +08:00
wyx
ecee246a5c fix:开课附件上传未保存问题修改 2023-03-15 17:30:47 +08:00
huangshengfa
14a0ec5294 Merge branch 'dev_Ma_pre' into 'develop'
提交

See merge request !87
2023-03-15 16:38:36 +08:00
BOE\10867418
3f3438db7b 提交 2023-03-15 16:37:51 +08:00
wyx
bef43237b0 feat:旧版管理员界面跳转添加 2023-03-15 15:55:10 +08:00
wyx
761b8a9f40 feat:增加根据用户权限判断当用户进入管理员端展示的界面。 2023-03-15 15:07:36 +08:00
wyx
fa431338c8 style:新版面授课界面添加 2023-03-14 18:50:18 +08:00
huangshengfa
8c18ebebff Merge branch 'dev_Ma_pre' into 'develop'
Dev ma pre

See merge request !86
2023-03-14 15:59:14 +08:00
BOE\10867418
81b40b9ae9 去除中间域名 2023-03-14 15:56:01 +08:00
BOE\10867418
850115a223 fixed 2023-03-14 13:18:45 +08:00
BOE\10867418
058ab6ec13 fixed 2023-03-14 12:30:22 +08:00
BOE\10867418
c0ba33945d fixed 2023-03-14 12:27:19 +08:00
BOE\10867418
a65bf49d8e 修改导出,组织 2023-03-14 12:20:20 +08:00
BOE\10867418
b1fd588249 修改组织 2023-03-14 12:12:10 +08:00
yuping
9777330250 -- fix 评估管理查看bug 2023-03-14 11:33:04 +08:00
BOE\10867418
11ec8fcd7a Merge branch 'dongwu_develop' into boe_develop 2023-03-14 08:49:45 +08:00
yuping
f8816f0df4 -- fix 评估管理查看bug 2023-03-13 21:19:21 +08:00
yuping
7ae02e9ec3 Merge remote-tracking branch 'origin/develop' into develop 2023-03-13 18:51:19 +08:00
yuping
7f36db4f4c -- fix 评估管理查看bug 2023-03-13 18:51:09 +08:00
BOE\10867418
791106b304 去最后一级 2023-03-13 17:55:26 +08:00
BOE\10867418
157de87615 1 2023-03-13 17:44:16 +08:00
BOE\10867418
dd55c7dfb4 组织 2023-03-13 17:38:58 +08:00
BOE\10867418
1a23c447de 1 2023-03-13 17:31:48 +08:00
BOE\10867418
f283084562 更新 2023-03-13 17:26:35 +08:00
yujicun
62d5e6e97d Merge remote-tracking branch 'origin/develop' into develop 2023-03-13 10:22:39 +08:00
wyx
2a745b7ae5 fix:面授课编辑后附件路径变化问题修改 2023-03-13 10:11:25 +08:00
lixg
18995ac830 feat:合并 2023-03-13 09:13:12 +08:00
lixg
d31c1f9537 feat:隐藏二维码提示 2023-03-13 09:12:46 +08:00
李东进1
e3f7b9249e +按钮 2023-03-10 21:46:58 +08:00
caozc
507f4a1e6b fix:跳转新tab页 2023-03-10 20:35:30 +08:00
huangshengfa
77f2f700dc Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !79
2023-03-10 20:03:58 +08:00
wyx
5d32e634b7 fix:修改版本号 2023-03-10 19:54:59 +08:00
wyx
d6291d86b9 fix:修改版本号 2023-03-10 19:53:48 +08:00
wyx
beb6905312 Merge branch 'develop' into manage-release 2023-03-10 19:52:49 +08:00
wyx
f1f438b952 fix:作业无附件处理 2023-03-10 18:07:21 +08:00
yujicun
8470b42cfb Merge remote-tracking branch 'origin/develop' into develop 2023-03-10 18:07:17 +08:00
yuping
c3f9bad2a7 Merge remote-tracking branch 'origin/develop' into develop 2023-03-10 17:53:23 +08:00
yuping
434665e7e9 -- fix bug 2023-03-10 17:53:04 +08:00
wyx
9f23973035 Merge branch 'manage-release' 2023-03-10 17:21:05 +08:00
wyx
09e06d3aec Merge branch 'develop' into manage-release 2023-03-10 17:20:34 +08:00
lixg
942991ca3c feat:合并 2023-03-10 17:17:59 +08:00
lixg
9ee7f16f88 feat:修改评估二维码 2023-03-10 17:13:11 +08:00
wyx
4b6eda4b07 fix:修改版本号 2023-03-10 17:05:18 +08:00
wyx
197540a7a4 fix:修改版本号 2023-03-10 17:04:14 +08:00