chore: 🔨 合并冲突解决

2024-11-16 23:00:30 +08:00
parent 2dd4421fdf
commit 711e3ba5f4
48 changed files with 207 additions and 791 deletions
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -30,11 +30,7 @@
 </template>

 <script setup lang="ts">
-import {
-  ElImageViewer,
-  UploadRawFile,
-  UploadRequestOptions,
-} from "element-plus";
+import { ElImageViewer, UploadRawFile, UploadRequestOptions } from "element-plus";
 import FileAPI from "@/api/file";

 const props = defineProps({