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

疯狂的狮子li

2021-05-24 caa81d1f4dbb0f608b7a6848e673eca2c4a69d10

 ruoyi-ui/src/router/index.js

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

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

/**
 * Note: 路由配置项