diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 7e23c3e2..48212252 100644
--- 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
   }
 }
diff --git a/src/components/common/hot/index.vue b/src/components/common/hot/index.vue
index b0c21f90..341f6331 100644
--- 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>