BOE\10867418
|
edd9d95fbf
|
Merge branch 'dev_0801test' into dev0731
# Conflicts:
# src/components/NavLeft.vue
|
2023-08-15 10:38:04 +08:00 |
|
weixiaobo@boe.com.cn
|
272d91f721
|
餐单放开报表中心
|
2023-08-15 10:36:18 +08:00 |
|
nisen
|
cf931d4112
|
学习路径和项目的开课编辑
|
2023-08-15 10:01:26 +08:00 |
|
U-BOE\ZXYJY05
|
fb303d7c46
|
编辑和删除
|
2023-08-11 10:22:25 +08:00 |
|
nisen
|
f44fb7afb9
|
学习路径图课程不能编辑和删除
|
2023-08-11 09:43:49 +08:00 |
|
nisen
|
1bc8737beb
|
修改
|
2023-08-10 18:30:20 +08:00 |
|
nisen
|
522ed89fb7
|
开课编辑把时间变成空
|
2023-08-10 17:56:13 +08:00 |
|
nisen
|
9d70563431
|
学习路径图和项目的开课新建课程传递时间
|
2023-08-10 17:52:16 +08:00 |
|
yujicun
|
b2619a406e
|
修改菜单
|
2023-08-08 19:03:38 +08:00 |
|
yujicun
|
bacc3249a9
|
修改合并错误
|
2023-08-08 17:17:57 +08:00 |
|
yujicun
|
eef5e2a61d
|
合并解决冲突
|
2023-08-08 17:00:48 +08:00 |
|
yuping
|
fd4d72b9c4
|
Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into user-modify
|
2023-08-08 16:50:18 +08:00 |
|
yuping
|
fa31a9ff12
|
---fix bug
|
2023-08-08 15:33:49 +08:00 |
|
yuping
|
56f64149a7
|
---fix bug
|
2023-08-08 15:29:04 +08:00 |
|
yujicun
|
3c2bd7af14
|
Merge remote-tracking branch 'origin/user-modify' into dev0731
|
2023-08-08 11:24:44 +08:00 |
|
yuping
|
6f088ec29c
|
---fix bug
|
2023-08-08 08:47:55 +08:00 |
|
yuping
|
715b5eae1c
|
Merge remote-tracking branch 'origin/user-modify' into user-modify
|
2023-08-08 08:20:44 +08:00 |
|
yuping
|
f3306efce0
|
---fix bug
|
2023-08-08 08:20:29 +08:00 |
|
nisen
|
aa366d7be0
|
项目面授开课数据显示
|
2023-08-07 21:11:53 +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 |
|
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
|
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 |
|
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
|
6804653285
|
fix bug
|
2023-08-04 17:51:27 +08:00 |
|
nisen
|
5ada167cfb
|
受众数据和返回接口
|
2023-08-04 15:06:45 +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
|
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
|
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 |
|
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
|
0611639330
|
zcwy-dev 补充
|
2023-08-01 20:53: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
|
c2b08827fa
|
受众管理菜单控制
|
2023-08-01 16:49:39 +08:00 |
|
weixiaobo@boe.com.cn
|
f10b1c1fde
|
加固定受众餐单
|
2023-08-01 16:35:33 +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
|
8fbc18a1dc
|
Merge remote-tracking branch 'origin/user-modify' into cloud
|
2023-07-28 16:04:05 +08:00 |
|