jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Browse Source 
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
	ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
	ruoyi/src/main/resources/vm/java/domain.java.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
This commit is contained in:
疯狂的狮子li
2020-04-29 09:16:29 +08:00
parent 405ad4280c aa23ef1e99
commit 1dae7c9bc9
11 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/store/modules/permission.js
View File

@ -48,7 +48,7 @@ function filterAsyncRouter(asyncRouterMap) {
}
export const loadView = (view) => { // 路由懒加载
return () => import(`@/views/${view}`)
return (resolve) => require([`@/views/${view}`], resolve)
}
export default permission