合并分支 'zax' 到 'master'

src/router/index.js

@@ -74,6 +74,12 @@ export default new Router({
                     name: 'personPage',
                     component: resolve => require(['../components/basicInformation/person/personPage.vue'], resolve)
                 },
+                // 基础资料管理-单位管理
+                {
+                    path: '/company',
+                    name: 'company',
+                    component: resolve => require(['../components/basicInformation/company/company.vue'], resolve)
+                },
             ]
         }
     ]