Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/router/index.js

@@ -116,8 +116,9 @@ export const constantRoutes = [
         props: true,
         component: () => import('@/views/equipment-management/equipment-management/equipment-management'),
         name: 'EquipmentManagement',
-        meta: { title: '设备管理', icon: 'date' },
-        children: [
+        meta: { title: '设备管理', icon: 'date' }
+
+      },
       {
         path: 'equipment-detail/:id',
         props: true,
@@ -132,6 +133,7 @@ export const constantRoutes = [
         name: 'EquipmentAdd',
         meta: { title: '设备新增' }
       },
+
       {
         path: 'use-management',
         props: true,
@@ -146,11 +148,6 @@ export const constantRoutes = [
         name: 'UseDetails',
         meta: { title: '使用详情', icon: 'table', activeMenu: '/use-details' }
       }
-
-
-        ]
-      },
-
     ]
   },
   // 病历管理