From b9bfbeb37047ef9ed603731f245cab7cc5780d19 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Mon, 13 May 2024 13:36:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/types/components.d.ts | 4 ---- src/views/sysworkflow/codepage/page0318.vue | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/types/components.d.ts b/src/types/components.d.ts index c2dc29064..e0a3166d9 100644 --- a/src/types/components.d.ts +++ b/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'] diff --git a/src/views/sysworkflow/codepage/page0318.vue b/src/views/sysworkflow/codepage/page0318.vue index b9ec8476d..2e6ab3a91 100644 --- a/src/views/sysworkflow/codepage/page0318.vue +++ b/src/views/sysworkflow/codepage/page0318.vue @@ -212,3 +212,4 @@ onMounted(() => { } +