解决API文档和路由配置合并冲突

web/src/router/index.ts

@@ -89,6 +89,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       }
     ]
   },
+<<<<<<< HEAD
   {
     path: '/xljk',
     component: Layout,
@@ -139,6 +140,12 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     ]
   }
 ];
+=======
+];
+
+// 动态路由，基于用户权限动态去加载
+export const dynamicRoutes: RouteRecordRaw[] = [];
+>>>>>>> e450a8ffe73adab129a8f940bff3316c0361aa7a
 
 /**
  * 创建路由