From 426dc7343206e86b07d47e451b916b92688c154c Mon Sep 17 00:00:00 2001
From: zyl <731870902@qq.com>
Date: Wed, 26 Nov 2025 09:59:57 +0800
Subject: [PATCH] =?UTF-8?q?uploadFiles.vue=E4=B8=AD=E7=9A=84=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=9C=B0=E5=9D=80=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/auto-imports.d.ts                 | 1 -
 src/renderer/src/components/upload/uploadFiles.vue | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/src/renderer/src/auto-imports.d.ts b/src/renderer/src/auto-imports.d.ts
index f06b3ba..72bc97c 100644
--- a/src/renderer/src/auto-imports.d.ts
+++ b/src/renderer/src/auto-imports.d.ts
@@ -8,7 +8,6 @@ export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
   const ElMessage: typeof import('element-plus/es')['ElMessage']
-  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
   const computed: typeof import('vue')['computed']
   const createApp: typeof import('vue')['createApp']
   const customRef: typeof import('vue')['customRef']
diff --git a/src/renderer/src/components/upload/uploadFiles.vue b/src/renderer/src/components/upload/uploadFiles.vue
index ed54734..a419421 100644
--- a/src/renderer/src/components/upload/uploadFiles.vue
+++ b/src/renderer/src/components/upload/uploadFiles.vue
@@ -52,12 +52,8 @@ const isUploading = ref(false)
 // 上传地址
 const uploadUrl = () => {
   //process.env.BASE_API +
-<<<<<<< HEAD
   console.log(process.env.BASE_API, 'yyyyy')
   let url = (localStorage.getItem("ip") || 'http://127.0.0.1:8848') + '/auth/import'
-=======
-  let url = 'http://127.0.0.1:8848' + '/auth/import'
->>>>>>> 9394a3aef8b65530205a25c61da8405085d63c1c
   return url
 }
 // 上传前处理