冲突

src/router/routes/routes-file-six.ts

@@ -40,11 +40,7 @@ const HomeRoutes = {
           name: 'DepartureGoods',
           meta: { title: '国内出港行李视图', elSvgIcon: 'Fold', icon: 'table' },
           component: () =>
-<<<<<<< HEAD
             import('@/views/baggageManagement/departure/goods/index.vue'),
-=======
-            import("@/views/baggageManagement/departure/goods/index.vue"),
->>>>>>> a499e9b5ccb7fe2f628b0686adcc1cf22a94e2a6
         },
       ],
     },
@@ -86,7 +82,7 @@ const HomeRoutes = {
           name: 'ArrivalGoods',
           meta: { title: '国内进港行李视图', elSvgIcon: 'Fold', icon: 'table' },
           component: () =>
-            import("@/views/baggageManagement/departure/goods/index.vue"),
+            import('@/views/baggageManagement/departure/goods/index.vue'),
         },
       ],
     },