From b6820b43680afccb56b6c448f653ae6160c3e516 Mon Sep 17 00:00:00 2001
From: miao <2514145421@qq.com>
Date: Wed, 8 Mar 2023 11:42:44 +0800
Subject: [PATCH] Merge branch 'master_v2' of
 http://www.cloudview.work/git/fangxiang/media_player_client into master_v2

# Conflicts:
#	src/components/ControlPanelDialog.vue
---
 src/components/ControlPanelDialog.vue | 4 ++++
 1 file changed, 4 insertions(+)

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