Merge branch 'develop/3.1.5' into test

src/router/index.js

@@ -209,12 +209,12 @@ export const dynamicRoutes = [{
   permissions: ['device:list:list'],
   name: 'deviceList',
   children: [{
-    path: 'list/detail',
+    path: 'deviceList/detail',
     component: () => import('@/views/device/list/detail'),
     name: 'deviceListDetail',
     meta: {
       title: '设备详情',
-      activeMenu: '/device/DeviceList'
+      activeMenu: '/device/deviceList'
     }
   }]
 },

src/views/device/list/index.vue

@@ -162,7 +162,7 @@ export default {
     // 新增 / 编辑 / 查看
     getChange(id, boolean) {
       this.$router.push({
-        path: `/device/list/detail`,
+        path: `/device/deviceList/detail`,
         query: {
           id: id,
           boolean: boolean