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

疯狂的狮子li

2021-10-11 741a5b275ba3d1a9099d2c5dce94e7a192db66c1

 ruoyi-ui/src/router/index.js

@@ -126,6 +126,19 @@
    ]
  },
  {
    path: '/system/oss-config',
    component: Layout,
    hidden: true,
    children: [
      {
        path: 'index',
        component: (resolve) => require(['@/views/system/oss/config'], resolve),
        name: 'OssConfig',
        meta: { title: '配置管理', activeMenu: '/system/oss'}
      }
    ]
  },
  {
    path: '/monitor/job-log',
    component: Layout,
    hidden: true,