add

config/config.js

@@ -123,15 +123,12 @@ export default {
                   component: './building/list/index',
                 },
                 {
-<<<<<<< HEAD
-=======
                   path: '/building/list/add',
                   name: '项目添加', // 项目添加
                   hideInMenu: true,
                   component: './building/list/add/index',
                 },
                 {
->>>>>>> ed52b30a02a5604a8626322e59d620f25aa7558d
                   path: '/building/type',
                   name: '项目类型',
                   component: './building/type/index',
@@ -155,15 +152,12 @@ export default {
                   component: './customer/customerlist/index',
                 },
                 {
-<<<<<<< HEAD
-=======
                   path: '/customer/customerlist/customerDetail',
                   name: '客户编辑',
                   hideInMenu: true,
                   component: './customer/customerlist/customerDetail',
                 },
                 {
->>>>>>> ed52b30a02a5604a8626322e59d620f25aa7558d
                   path: '/customer/drift/list',
                   name: '游客列表',
                   component: './customer/drift/index',
@@ -292,15 +286,12 @@ export default {
                   name: '资讯列表',
                   component: './news/list/NewsList',
                 },
-<<<<<<< HEAD
-=======
                 {
                   path: '/news/list/editNewsList',
                   name: '编辑资讯',
                   hideInMenu: true,
                   component: './news/list/editNewsList',
                 },
->>>>>>> ed52b30a02a5604a8626322e59d620f25aa7558d
               ],
             },
             {
@@ -356,9 +347,6 @@ export default {
                   hideInMenu: true,
                   component: './staff/list/editRole',
                 },
-<<<<<<< HEAD
-             
-=======
                 {
                   path: '/staff/list/addRole',
                   name: '添加角色',
@@ -394,7 +382,6 @@ export default {
                   hideInMenu: true,
                   component: './carouselFigure/editAdvertising',
                 },
->>>>>>> ed52b30a02a5604a8626322e59d620f25aa7558d
               ],
             },
             {