Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-02 a4edce5a93628e459f0c63071e6383383d86520c

 ruoyi-ui/src/router/index.js

@@ -5,6 +5,7 @@

/* Layout */
import Layout from '@/layout'
import ParentView from '@/components/ParentView';

/**
 * Note: 路由配置项