fix:merge冲突

src/router/index.ts

@@ -142,7 +142,8 @@ export const routes: Array<ROUTER.RoutesProps> = [
         path: '/task',
         name: '任务中心',
         redirect: '/task/manage',
-        icon: 'DatabaseOutlined',
+        // <container-outlined />
+        icon: 'ContainerOutlined',
         children: [
           {
             path: '/task/manage',