解决冲突

apps/web-ele/src/router/routes/local.ts

@@ -235,18 +235,6 @@ const localRoutes: RouteRecordStringComponent[] = [
     name: 'ViewExamResult',
     path: '/examManage/myExamPaper/result/:id',
   },
-<<<<<<< HEAD
-    {
-    component: '/schedule/work/class/component/addandedit',
-    meta: {
-      activePath: '/schedule/work/class',
-      icon: 'carbon:information',
-      title: '开班',
-      hideInMenu: true,
-    },
-    name: 'AddClass',
-    path: '/schedule/work/class/addandedit',
-=======
   {
     component: '/system/assetManage/archivesManage/detail',
     meta: {
@@ -257,8 +245,18 @@ const localRoutes: RouteRecordStringComponent[] = [
     },
     name: 'AssetArchivesDetail',
     path: '/system/assetManage/archivesManage/detail/:id',
->>>>>>> 0e1f6ad81045fb3321fea8042547bff705cc8a75
   },
+  {
+    component: '/schedule/work/class/component/addandedit',
+    meta: {
+      activePath: '/schedule/work/class',
+      icon: 'carbon:information',
+      title: '开班',
+      hideInMenu: true,
+    },
+    name: 'AddClass',
+    path: '/schedule/work/class/addandedit',
+  }
 ];
 
 /**

packages/@core/base/shared/src/constants/dict-enum.ts

@@ -32,10 +32,6 @@ export enum DictEnum {
   WF_BUSINESS_STATUS = 'wf_business_status', // 业务状态
   WF_FORM_TYPE = 'wf_form_type', // 表单类型
   WF_TASK_STATUS = 'wf_task_status', // 任务状态
-<<<<<<< HEAD
-  TICKET_STATUS = 'ticket_status', // 工单状态
   TASK_TYPE = 'task_type', // 任务类型
   WORK_CONTENT = 'work_content', // 上班内容
-=======
->>>>>>> 0e1f6ad81045fb3321fea8042547bff705cc8a75
 }