From ea5f50ff8e2da791e0b00fb02061d76b3c88e0f8 Mon Sep 17 00:00:00 2001
From: miao <2514145421@qq.com>
Date: Wed, 8 Mar 2023 11:58:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AD=94=E5=A2=99=EF=BC=9A=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ControlPanelDialog.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue
index 57821b8..6bf1149 100644
--- a/src/components/ControlPanelDialog.vue
+++ b/src/components/ControlPanelDialog.vue
@@ -1494,10 +1494,6 @@ export default defineComponent({
         });
       }
       if(a.length==0){
-<<<<<<< HEAD
-=======
-        console.log(123)
->>>>>>> b2f88140799e0867e7ee99aaa09fe88f841aa673
         test_monitor_list.value.forEach((ele) => {
           ele.isHide = false;
         })