From 39590bc5f035007810bbabefcf55fda418631666 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 14 Jul 2023 10:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitoringEquipment/photographicDevice/index.vue          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 0018cda..f1e3772 100644
--- 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"