4018 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
yuping	5125b34664	fix bug	2023-08-03 16:52:55 +08:00
yuping	689571dbef	Merge branch 'user-modify' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into user-modify ... # Conflicts: # src/App.vue # src/api/request.js # src/main.js	2023-08-03 15:38:38 +08:00
yuping	9469978bf8	fix bug	2023-08-03 14:50:34 +08:00
yujicun	9662c21d5b	Merge remote-tracking branch 'boe/dev0731' into dev0731	2023-08-03 14:35:57 +08:00
yujicun	e1a8468d78	Merge remote-tracking branch 'boe/dev_0801test' into dev0731	2023-08-03 14:35:19 +08:00
weixiaobo@boe.com.cn	4ee0a059f0	Merge remote-tracking branch 'origin/dev_202306' into dev_0801test	2023-08-03 14:32:07 +08:00
weixiaobo@boe.com.cn	4be1c0c915	修改受众导入模板	2023-08-03 14:30:56 +08:00
yuping	c4e788ec4f	fix bug	2023-08-03 14:22:44 +08:00
weixiaobo@boe.com.cn	2f215ea0e4	受众管理已发布不能删除	2023-08-03 14:18:40 +08:00
joshen@zcwytd.com	2fdb243eae	面授管理更改OrgClassCheck页面	2023-08-02 14:22:23 +08:00
joshen@zcwytd.com	19bf2f951b	案例推荐	2023-08-02 14:01:33 +08:00
joshen@zcwytd.com	34f42c5f01	案例推荐接口问题	2023-08-02 13:16:52 +08:00
lims1@hunktimes.com	e86ee736a4	合并异常解决	2023-08-02 11:04:10 +08:00
lims1@hunktimes.com	77be18ca74	恢复注释	2023-08-02 10:15:42 +08:00
lims1@hunktimes.com	0611639330	zcwy-dev 补充	2023-08-01 20:53:35 +08:00
yujicun	d8578d435e	Merge remote-tracking branch 'boe/dev0731' into dev0731	2023-08-01 19:09:15 +08:00
weixiaobo@boe.com.cn	e1061d1452	Merge remote-tracking branch 'origin/dev_202306' into dev_0801test	2023-08-01 19:07:47 +08:00
weixiaobo@boe.com.cn	073bcd70fe	导入受众样式及逻辑	2023-08-01 19:01:35 +08:00
nisen	4f6c93d002	vue文件InitiateRecommend	2023-08-01 18:08:38 +08:00
nisen	19c8dee418	合并zcwy-dev	2023-08-01 18:03:29 +08:00
weixiaobo@boe.com.cn	ae70e3cc9f	Merge remote-tracking branch 'origin/dev_202306' into dev_0801test	2023-08-01 17:12:59 +08:00
weixiaobo@boe.com.cn	6f70a65b79	导入增加提示文字	2023-08-01 17:12:36 +08:00
weixiaobo@boe.com.cn	89cb4c8d28	Merge remote-tracking branch 'origin/dev_202306' into dev_0801test	2023-08-01 17:04:16 +08:00
weixiaobo@boe.com.cn	26ed5d038b	复制受众默认名称	2023-08-01 17:00:46 +08:00
weixiaobo@boe.com.cn	c2b08827fa	受众管理菜单控制	2023-08-01 16:49:39 +08:00
weixiaobo@boe.com.cn	f10b1c1fde	加固定受众餐单	2023-08-01 16:35:33 +08:00
weixiaobo@boe.com.cn	e2b1a7436f	Merge remote-tracking branch 'origin/dev_202306' into dev_0801test	2023-08-01 16:20:39 +08:00
weixiaobo@boe.com.cn	99a887ce8c	受众更新接口	2023-08-01 15:23:47 +08:00
weixiaobo@boe.com.cn	f2e56e0525	受众导入成功逻辑	2023-08-01 15:21:35 +08:00
weixiaobo@boe.com.cn	da080ff73f	受众导入成功失败逻辑	2023-08-01 14:21:02 +08:00
weixiaobo@boe.com.cn	805f2233e0	导入学员	2023-07-31 18:51:55 +08:00
weixiaobo@boe.com.cn	83518f04a0	添加编辑受众逻辑	2023-07-31 17:26:37 +08:00
weixiaobo@boe.com.cn	afc9bd3b86	添加受众成员样式及逻辑	2023-07-31 15:46:08 +08:00
weixiaobo@boe.com.cn	f65c10e51c	添加受众成员逻辑	2023-07-31 14:12:08 +08:00
weixiaobo@boe.com.cn	f903590f54	受众添加成员逻辑	2023-07-30 19:39:20 +08:00
weixiaobo@boe.com.cn	1cef1f4fa3	受众添加成员的接口	2023-07-30 14:40:51 +08:00
yujicun	f419061cd5	Merge remote-tracking branch 'origin/user-modify' into cloud	2023-07-28 18:45:23 +08:00
yuping	f6e77b740c	---fix bug	2023-07-28 18:41:55 +08:00
yuping	7aab20177b	---fix bug	2023-07-28 18:31:06 +08:00
yujicun	ba2d86f470	Merge remote-tracking branch 'origin/user-modify' into cloud	2023-07-28 18:18:24 +08:00
yuping	8ffff197fa	---fix bug	2023-07-28 17:53:57 +08:00
yujicun	61630c442f	Merge remote-tracking branch 'origin/user-modify' into cloud	2023-07-28 17:43:17 +08:00
yuping	e8612a32cf	---fix bug	2023-07-28 17:40:01 +08:00
yujicun	0ffa6683ef	Merge remote-tracking branch 'origin/user-modify' into cloud	2023-07-28 17:01:36 +08:00
yuping	0f5929f34e	---fix bug	2023-07-28 16:59:59 +08:00
yujicun	b7411c8350	Merge remote-tracking branch 'origin/user-modify' into cloud	2023-07-28 16:40:42 +08:00
yuping	18cea294c0	---fix bug	2023-07-28 16:40:00 +08:00
yujicun	8fbc18a1dc	Merge remote-tracking branch 'origin/user-modify' into cloud	2023-07-28 16:04:05 +08:00
yuping	ff2c0e4fde	---fix bug	2023-07-28 15:51:44 +08:00
yuping	9fde3a1ea2	---fix bug	2023-07-28 13:50:06 +08:00