解决冲突

2024-08-12 17:40:10 +08:00 · 2024-08-12 17:40:10 +08:00 · d1f060888d
parent 511f6bf6c6
commit d1f060888d
2 changed files with 1 additions and 5 deletions
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@ -283,12 +283,8 @@
    "watchThrottled": true,
    "watchTriggerable": true,
    "watchWithFilter": true,
-<<<<<<< HEAD
-    "whenever": true
-=======
    "whenever": true,
    "ElMessageBox": true,
    "ElMessage": true
->>>>>>> master
  }
 }
--- a/src/components/common/hot/index.vue
+++ b/src/components/common/hot/index.vue
@ -1,6 +1,6 @@
 <!-- 上传组件 -->
 <template>
-    <el-dialog v-model="dialog_visible" append-to-body fullscreen @close="close_event">
+    <el-dialog v-model="dialog_visible" fullscreen @close="close_event">
        <template #header>
            <div class="title re">
                <div class="tc size-16 fw">编辑热区</div>