Commit Graph

469 Commits

Author SHA1 Message Date
lims1@hunktimes.com
77be18ca74 恢复注释 2023-08-02 10:15:42 +08:00
nisen
19c8dee418 合并zcwy-dev 2023-08-01 18:03:29 +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
f903590f54 受众添加成员逻辑 2023-07-30 19:39:20 +08:00
weixiaobo@boe.com.cn
1cef1f4fa3 受众添加成员的接口 2023-07-30 14:40:51 +08:00
yuping
f6e77b740c ---fix bug 2023-07-28 18:41:55 +08:00
yuping
0f5929f34e ---fix bug 2023-07-28 16:59:59 +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
yuping
9d2760c3cf fix bug 用户中心接口调整 2023-07-13 14:44:50 +08:00
yuping
be90a8b34e fix bug 用户中心接口调整 2023-07-08 11:14:37 +08:00
weixiaobo@boe.com.cn
a5d65abb92 受众列表、复制、发布、启用、停用、删除 2023-07-05 15:57:21 +08:00
yuping
0e8341f980 接口调整 2023-07-02 18:21:27 +08:00
yuping
7f42b60444 --fix 评估重写 2023-04-14 16:10:41 +08:00
BOE\10867418
c42ba9e48e Merge branch 'dev_m' into develop 2023-03-30 14:55:40 +08:00
mx00085@163.com
4fb5105b03 feat: 营运数据接口联调,部分央视修改 2023-03-30 14:53:34 +08:00
BOE\10867418
587384051e Merge branch 'dev_m' into develop 2023-03-29 17:16:05 +08:00
mx00085@163.com
e63092e3fe Merge branch 'dev_m' of http://10.251.129.121/boeu/fe-manage into dev_m 2023-03-29 16:29:40 +08:00
mx00085@163.com
bf2e938bf4 feat: 报表三期接口联调 2023-03-29 16:29:15 +08:00
BOE\10867418
67c0b447de Merge branch 'dev_m' into develop 2023-03-29 15:12:45 +08:00
BOE\10867418
f8fa3a0bb5 Merge branch 'dev_m' into develop 2023-03-29 14:53:35 +08:00
BOE\10773509
3e4ba3639b 学习路径图、案例页面接口联调 2023-03-29 10:53:29 +08:00
mx00085@163.com
e2740bf00e feat: 文章,项目,课程接口联调 2023-03-28 18:09:48 +08:00
yuping
dbcf90345f --fix bug 2023-03-28 14:35:49 +08:00
yujicun
1021c20eec Merge remote-tracking branch 'origin/develop' into develop 2023-03-24 09:27:07 +08:00
yuping
6337b811cd --fix bug 系统报错提示 2023-03-24 03:50:10 +08:00
BOE\10867418
a182e2c154 Merge branch 'dongwu_develop' into develop 2023-03-22 17:14:29 +08:00
yuping
7c1a53ca71 --fix bug 2023-03-22 13:02:40 +08:00
BOE\10867418
0f16b94b7a Merge branch 'dongwu_develop' into develop 2023-03-22 09:46:20 +08:00
yuping
8c505ef996 --fix bug 2023-03-22 01:58:51 +08:00
yujicun
bd3b9ec181 Merge remote-tracking branch 'origin/develop' into develop 2023-03-21 15:37:28 +08:00
yuping
91834a027c --fix bug 2023-03-21 15:34:56 +08:00
BOE\10867418
94b570de4a Merge branch 'dongwu_develop' into boe_develop 2023-03-20 09:47:24 +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
1184560188 fix:页面权限刷新判断显示问题修改 2023-03-17 15:25:34 +08:00
wyx
fe2a9a69bc fix:returnUrl配置问题修改 2023-03-17 12:54:32 +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
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
wyx
849256f4c6 feat:增加登录的returnUrl 2023-03-15 17:46:28 +08:00
BOE\10867418
81b40b9ae9 去除中间域名 2023-03-14 15:56:01 +08:00
BOE\10867418
d35fd52e0f 修改域名 2023-03-10 15:03:53 +08:00
mx00085@163.com
6b073227bb fix: 按钮修改 2023-03-09 16:16:27 +08:00
mx00085@163.com
dd76f32361 Merge branch 'develop' of http://10.251.129.121/boeu/fe-manage into dev_m 2023-03-09 15:55:46 +08:00
mx00085@163.com
4514db4b10 fix: token设置 2023-03-09 15:50:13 +08:00
huangshengfa
fa1d2c2ad3 Merge branch 'pre-dev' into 'develop'
Pre dev

See merge request !69
2023-03-09 08:44:34 +08:00
lpq
55e721f602 学员添加判断 2023-03-08 23:59:42 +08:00