(*)路由冲突

web/client/src/sections/humanAffairs/routes.js

@@ -82,21 +82,6 @@ export default [{
                         component: OvertimeStatistics,
                         breadcrumb: '加班统计',
                     }]
-<<<<<<< HEAD
-                },
-                    // {
-                    //     path: '/communication',
-                    //     key: 'communication',
-                    //     breadcrumb: '员工沟通',
-                    //     childRoutes: [{
-                    //         path: '/employeeCommunication',
-                    //         key: 'employeeCommunication',
-                    //         component: EmployeeCommunication,
-                    //         breadcrumb: '员工沟通统计',
-                    //     }]
-                    // }
-                ]
-=======
                 }, {
                     path: '/communication',
                     key: 'communication',
@@ -108,7 +93,6 @@ export default [{
                         breadcrumb: '员工沟通统计',
                     }]
                 }]
->>>>>>> dfde26653d43d65f3734d7b787e34d37d51c55de
             }, {
                 path: '/recruit',
                 key: 'recruit',