diff --git a/src/views/deviceManage/editDevice.vue b/src/views/deviceManage/editDevice.vue
index 5b23998..2f4507a 100644
--- a/src/views/deviceManage/editDevice.vue
+++ b/src/views/deviceManage/editDevice.vue
@@ -2,14 +2,6 @@
   <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" append-to-body>
     <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-well-code="right" label-width="100px">
       <el-row :gutter="20">
-<<<<<<< HEAD
-=======
-        <!--<el-col :span="12">-->
-        <!--<el-form-item label="设备名称" prop="deviceName">-->
-        <!--<el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>-->
-        <!--</el-form-item>-->
-        <!--</el-col>-->
->>>>>>> 7fc756b... MOD：更新总览界面显示搜索bug, 增加部分注释
         <el-col :span="12">
           <el-form-item label="设备名称" prop="deviceName">
             <el-input v-model.trim="deviceForm.deviceName" type="text" placeholder="必填"/>