合并代码

2 years ago · 39590bc5f0
parent 9b6e9806a9
commit 39590bc5f0
1 changed files with 0 additions and 4 deletions
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@ -324,11 +324,7 @@
                  <el-dropdown-item command="open">开启GPS</el-dropdown-item>
                  <el-dropdown-item command="close">关闭GPS</el-dropdown-item>
                </el-dropdown-menu>
-<<<<<<< HEAD
              </el-dropdown> -->
-=======
-              </el-dropdown>
->>>>>>> hn1.0
              <el-button
                type="text"
                class="deleteText"