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

疯狂的狮子Li

2021-11-21 b9b1ec8f4163bab66cf22bba784bf48b72167e76

 ruoyi-ui/src/router/index.js

@@ -139,19 +139,6 @@
    ]
  },
  {
    path: '/monitor/job-log',
    component: Layout,
    hidden: true,
    children: [
      {
        path: 'index',
        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
        name: 'JobLog',
        meta: { title: '调度日志', activeMenu: '/monitor/job'}
      }
    ]
  },
  {
    path: '/tool/gen-edit',
    component: Layout,
    hidden: true,