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

疯狂的狮子li

2021-12-27 dd37247e65374dd4ef7e8e8b9212d8f29023e301

 ruoyi-ui/src/router/index.js

@@ -135,16 +135,16 @@
    ]
  },
  {
    path: '/monitor/job-log',
    path: '/system/oss-config',
    component: Layout,
    hidden: true,
    permissions: ['monitor:job:list'],
    permissions: ['system:oss:list'],
    children: [
      {
        path: 'index',
        component: () => import('@/views/monitor/job/log'),
        name: 'JobLog',
        meta: { title: '调度日志', activeMenu: '/monitor/job' }
        component: () => import('@/views/system/oss/config'),
        name: 'OssConfig',
        meta: { title: '配置管理', activeMenu: '/system/oss' }
      }
    ]
  },