Merge branch 'master' of git.linkerplus.com:huangwf/Property-admin

# Conflicts:
#	src/router/index.js

src/pages/Parking/index.vue

@@ -1,4 +1,4 @@
-//
+//车位区域管理
 <template>
   <el-table
     :data="tableData"

src/router/index.js

@@ -61,7 +61,9 @@ import OperationLog             from '@/pages/System/OperationLog'
 
 import Complaints from '@/pages/Complaints/index'
 import StaffInfo from '@/pages/Staff/StaffInfo/index'
+import ParKing from '@/pages/ParKing/index' //停车位
 import StaffJurisdiction from '@/pages/Staff/StaffJurisdiction/index'
+import Letter from '@/pages/Letter/index' //收信记录
 
 import Vehicle from '@/pages/Vehicle/index'                                     //车辆管理
 import Architecture from '@/pages/Architecture/index'                                     //车辆管理