From eafdc7b870b52bba07a673507464ade10cccb625 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Wed, 20 Nov 2024 09:21:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into local-test

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

diff --git a/src/components/SysMenu.vue b/src/components/SysMenu.vue
index dcd83f7..6f11f8a 100644
--- a/src/components/SysMenu.vue
+++ b/src/components/SysMenu.vue
@@ -125,11 +125,7 @@ const list = reactive([
   },
   {
     show: true,
-<<<<<<< HEAD
-    path: '/sysManage/alarmRecord',
-=======
     path: '/alarmInfo/list',
->>>>>>> origin/develop
     label: '报警管理',
     icon: 'alarm_on',
   },