Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/router/config.js

@@ -1999,6 +1999,14 @@ export default {
           title: '添加修改车控页面'
         },
       },
+      {
+        path: '/tripBusOrder', //行程用车订单列表
+        name: 'tripBusOrder',
+        component: resolve => require(['@/components/busManagement/tripBusOrder'], resolve),
+        meta: {
+          title: '行程用车订单列表'
+        },
+      },
       {
         path: '/busHandBook', //首配依赖书
         name: 'busHandBook',