3698 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
BOE\10867418	94b570de4a	Merge branch 'dongwu_develop' into boe_develop	2023-03-20 09:47:24 +08:00
wyx	4149a6a56f	fix:修改版本号	2023-03-20 08:48:20 +08:00
yuping	a4e6e03791	--fix bug	2023-03-18 15:30:30 +08:00
yuping	58758da4e9	--fix bug	2023-03-18 13:57:02 +08:00
yuping	63ea5b3862	--fix bug 重复数据	2023-03-18 13:30:50 +08:00
yuping	7e391e6145	--fix bug 重复数据	2023-03-18 13:15:58 +08:00
yuping	38efcd780c	--demand 面授课	2023-03-18 00:54:02 +08:00
yuping	5522b5c2dc	Merge remote-tracking branch 'origin/develop' into develop ... # Conflicts: # src/components/drawers/AddOpenCourse.vue	2023-03-18 00:34:04 +08:00
yuping	8c7755c1c4	--demand 面授课	2023-03-18 00:32:32 +08:00
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
yuping	7b52f2d3e6	Merge remote-tracking branch 'origin/develop' into develop	2023-03-17 14:45:33 +08:00
yuping	01ba9921cf	--demand 面授课	2023-03-17 14:45:08 +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
wyx	c14660d79f	fix:修改版本号	2023-03-17 09:07:14 +08:00
wyx	366aa31090	Merge branch 'develop' into manage-release	2023-03-17 09:05:21 +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
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