4172 Commits

Author	SHA1	Message	Date
BOE\10867418	06801be579	Merge branch 'dongwu_develop' into boe_develop	2023-03-17 16:49:18 +08:00
wyx	280fb6c279	style:修改开课样式	2023-03-17 15:58:25 +08:00
wyx	7858a8a500	style:修改开课样式	2023-03-17 15:58:00 +08:00
lixg	59eaa6a51d	feat:合并	2023-03-17 15:34:15 +08:00
lixg	d95509628d	feat:修改项目任务二维码传参	2023-03-17 15:33:49 +08:00
wyx	1184560188	fix:页面权限刷新判断显示问题修改	2023-03-17 15:25:34 +08:00
yuping	f349acaa75	--demand 面授课	2023-03-17 14:59:37 +08:00
wyx	b5a5a3c0a3	Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop	2023-03-17 14:35:43 +08:00
wyx	6871702cd0	fix:路径图弹框问题	2023-03-17 14:35:38 +08:00
lixg	c0c0539e84	feat:合并	2023-03-17 14:12:52 +08:00
lixg	82ecfe44b9	feat:修改二维码传参	2023-03-17 14:00:51 +08:00
wyx	ff93d6819c	fix:学习路径删除问题修改	2023-03-17 13:01:38 +08:00
wyx	fe2a9a69bc	fix:returnUrl配置问题修改	2023-03-17 12:54:32 +08:00
lixg	0dcdd14298	feat:合并	2023-03-17 11:52:39 +08:00
dongruihua	ac618dd084	Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop ... # Conflicts: # src/App.vue	2023-03-17 10:54:49 +08:00
wyx	92e10e91ac	fix:修改版本号	2023-03-17 09:08:40 +08:00
yuping	43b1c9c2ce	Merge remote-tracking branch 'origin/develop' into develop	2023-03-17 03:08:43 +08:00
yuping	e68aeb246b	--demand 面授课	2023-03-17 03:08:28 +08:00
zhangyc	b546c86c7b	积分规则文字描述	2023-03-16 18:30:31 +08:00
huangshengfa	7f3ac7cc7f	Merge branch 'dev_Ma_pre' into 'master' ... Dev ma pre See merge request !91	2023-03-16 16:51:29 +08:00
wyx	cf8e0e72b7	feat:增加直播、活动考勤分页	2023-03-16 16:46:21 +08:00
huangshengfa	e59c4ad5f5	Merge branch 'dev_Ma_pre' into 'develop' ... 屏蔽草稿 See merge request !90	2023-03-16 10:51:46 +08:00
BOE\10867418	b8d3ed1cdc	屏蔽草稿	2023-03-16 10:51:00 +08:00
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
huangshengfa	6cae246506	Merge branch 'dev_Ma_pre' into 'master' ... Dev ma pre See merge request !88	2023-03-15 20:03:43 +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