Commit Graph

4250 Commits

Author SHA1 Message Date
weixiaobo@boe.com.cn
1d19e41ed3 受众搜索时pagaNo重置 2023-08-07 09:37:22 +08:00
yujicun
dfe1f28b8f Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-05 16:12:07 +08:00
yujicun
3f6e1b261e Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-05 16:11:10 +08:00
yuping
1a8836b4d5 fix bug 2023-08-05 15:44:44 +08:00
nisen
c0bf470fce change tips text 2023-08-05 15:33:55 +08:00
yujicun
c85f4fde57 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-05 15:08:39 +08:00
yuping
3cb3f34fcc fix bug 2023-08-05 14:23:57 +08:00
yuping
4785a53997 fix bug 2023-08-05 14:19:36 +08:00
yujicun
d90d9edf17 Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-05 14:17:36 +08:00
yujicun
b15ea31e47 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-05 14:16:53 +08:00
yuping
49e6d82d1b fix bug 2023-08-05 14:14:08 +08:00
nisen
987a6d6b5f 面授开课编辑和删除 2023-08-05 14:01:03 +08:00
yujicun
e8f1d09d29 Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-05 10:37:20 +08:00
yujicun
a660fa8685 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-05 10:36:59 +08:00
yuping
8b8d808ce4 fix bug 2023-08-04 18:53:25 +08:00
yuping
3b7b408897 fix bug 2023-08-04 18:50:22 +08:00
nisen
d18972e139 面授开课的编辑和删除弹窗 2023-08-04 18:33:30 +08:00
yuping
6804653285 fix bug 2023-08-04 17:51:27 +08:00
yujicun
520b5b08e3 Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-04 17:09:42 +08:00
yujicun
7c089620f8 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-04 17:08:51 +08:00
yuping
379f9448bd fix bug 2023-08-04 16:45:15 +08:00
nisen
5ada167cfb 受众数据和返回接口 2023-08-04 15:06:45 +08:00
weixiaobo@boe.com.cn
de4da25314 Merge remote-tracking branch 'origin/dev_202306' into dev_0801test 2023-08-04 14:33:21 +08:00
weixiaobo@boe.com.cn
3911a4663e 受众名称限制30,停用受众弹框提示 2023-08-04 14:32:22 +08:00
yujicun
e208f5ab92 Merge remote-tracking branch 'boe/dev_0801test' into dev0731 2023-08-04 13:55:00 +08:00
weixiaobo@boe.com.cn
fb4bca77b3 左侧菜单影藏报表中心 2023-08-04 13:54:13 +08:00
yujicun
dfeb4bdf98 Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-04 13:44:34 +08:00
yuping
e033ab825e fix bug 2023-08-04 12:16:28 +08:00
yujicun
360dc4c0cc Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-04 11:36:39 +08:00
yuping
a3a09ed70b fix bug 2023-08-04 11:32:47 +08:00
yujicun
7208653af0 Merge remote-tracking branch 'origin/user-modify' into cloud 2023-08-03 17:04:09 +08:00
yujicun
b7b78047aa Merge remote-tracking branch 'origin/user-modify' into dev0731 2023-08-03 17:03:46 +08:00
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