修改数据

src/types/components.d.ts

@@ -127,13 +127,9 @@ declare module '@vue/runtime-core' {
     IEpDownload: typeof import('~icons/ep/download')['default']
     IEpEdit: typeof import('~icons/ep/edit')['default']
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
-<<<<<<< HEAD
     IEpMinus: typeof import('~icons/ep/minus')['default']
     IEpOperation: typeof import('~icons/ep/operation')['default']
     IEpPicture: typeof import('~icons/ep/picture')['default']
-=======
-    IEpOperation: typeof import('~icons/ep/operation')['default']
->>>>>>> v8_master
     IEpPlus: typeof import('~icons/ep/plus')['default']
     IEpPosition: typeof import('~icons/ep/position')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']

src/views/sysworkflow/codepage/page0318.vue

@@ -212,3 +212,4 @@ onMounted(() => {
 }
 </style>
 
+