Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/router/index.js

@@ -120,7 +120,7 @@ export const constantRoutes = [
 
       },
       {
-        path: 'equipment-detail/:id',
+        path: 'equipment-detail/:id/:identify',
         props: true,
         component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
         name: 'EquipmentDetail',