hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 03:16:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,015 Commits 68 Branches 1 Tag
f543d1ee5b05dd39db0158ce20737053da4eeba3
Commit Graph

4015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joshen@zcwytd.com
f543d1ee5b 新增教师节 2023-09-06 17:21:30 +08:00
joshen
10b9e2cfa5 Merge branch 'zcwy-master' into 'master' 
面授和项目开课修改时间

See merge request !104
 2023-08-31 18:44:54 +08:00
nisen
adbcf75a63 面授和项目开课修改时间 2023-08-31 18:41:47 +08:00
joshen
eb009c8da0 Merge branch 'zcwy-master' into 'master' 
案例权限问题

See merge request !103
 2023-08-31 17:48:35 +08:00
nisen
dcef0fc852 案例权限问题 2023-08-31 12:30:16 +08:00
BOE\10867418
753014e681 隐藏报表 2023-08-30 10:54:41 +08:00
BOE\10867418
582806b2d8 Merge branch 'dongwu-master' 
# Conflicts:
#	src/views/case/CaseManage.vue
 2023-08-27 16:46:12 +08:00
yuping
114145a2db ---fix bug 2023-08-27 16:30:01 +08:00
yuping
f95a83270b ---fix bug 2023-08-27 16:10:13 +08:00
yuping
dfdb67f87d ---fix bug 2023-08-27 15:58:24 +08:00
yuping
44221e8006 ---fix bug 2023-08-27 15:55:10 +08:00
yuping
44aadbb9f6 ---fix bug 2023-08-27 15:55:01 +08:00
yuping
60c32a7174 ---fix bug 2023-08-27 15:39:13 +08:00
yuping
75e3105ee5 ---fix bug 2023-08-27 15:31:59 +08:00
yuping
d8945dec0a ---fix bug 2023-08-27 14:54:15 +08:00
yuping
87b364703b ---fix bug 2023-08-27 14:41:55 +08:00
yuping
36088a0ce8 ---fix bug 2023-08-27 14:36:51 +08:00
yuping
947165a203 ---fix bug 2023-08-27 14:21:16 +08:00
yuping
8a396d412a ---fix bug 2023-08-27 14:02:34 +08:00
yuping
c2113a33e6 Merge branch 'user-modify' 
# Conflicts:
#	src/api/ThirdApi.js
 2023-08-25 16:10:34 +08:00
yuping
0938845250 ---fix bug 2023-08-25 16:10:03 +08:00
yuping
2e19f357a5 ---fix bug 2023-08-25 14:52:40 +08:00
yuping
e79130182b Merge branch 'master' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage 2023-08-25 13:56:54 +08:00
yuping
945f25a07b fix bug 2023-08-25 11:55:22 +08:00
joshen
7ce5070e88 Merge branch 'dev0731' into 'master' 
Dev0731

See merge request !102
 2023-08-17 17:55:50 +08:00
BOE\10867418
c5f935b449 fix 2023-08-17 16:28:41 +08:00
BOE\10867418
311a4f8d72 fix 2023-08-17 15:56:10 +08:00
BOE\10867418
647ae66498 fix 2023-08-17 15:34:19 +08:00
BOE\10867418
f74909bc6c 修改 2023-08-17 15:23:14 +08:00
BOE\10867418
cfc1f3ab77 fix 2023-08-17 15:16:01 +08:00
BOE\10867418
46c4b4305e 修改路径图的组织树获取接口 2023-08-17 15:03:29 +08:00
nisen
8c2b8b8944 面授开课编辑 2023-08-15 11:25:34 +08:00
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
joshen
2a0b2b7ff2 Merge branch 'dev0731' into 'master' 
案例推荐页码数

See merge request !101
 2023-08-09 20:08:47 +08:00
nisen
c5fa6e205a 案例推荐页码数 2023-08-09 14:46:09 +08:00
449427055
f55eada741 Merge branch 'dev0731' into 'master' 
Dev0731

See merge request !100
 2023-08-08 19:09:19 +08:00
yujicun
e6f19b6fca Merge remote-tracking branch 'boe/dev0731' into dev0731 2023-08-08 19:04:54 +08:00
yujicun
b2619a406e 修改菜单 2023-08-08 19:03:38 +08:00
joshen
74adf3daa4 Merge branch 'dev0731' into 'master' 
Dev0731

See merge request !99
 2023-08-08 19:00:05 +08:00
yuping
dbdf3fb27c ---fix bug 2023-08-08 18:52:13 +08:00
nisen
0e074061e7 面授编辑限制 2023-08-08 18:33:32 +08:00
yuping
0771f610af ---fix bug 2023-08-08 17:18:11 +08:00
yujicun
bacc3249a9 修改合并错误 2023-08-08 17:17:57 +08:00