Merge remote-tracking branch 'origin/develop' into local-test
local-test分支构建发布 / Docker-Build (push) Successful in 1m52s
Details
local-test分支构建发布 / Docker-Build (push) Successful in 1m52s
Details
This commit is contained in:
parent
9a6d4efedb
commit
eafdc7b870
|
@ -125,11 +125,7 @@ const list = reactive([
|
|||
},
|
||||
{
|
||||
show: true,
|
||||
<<<<<<< HEAD
|
||||
path: '/sysManage/alarmRecord',
|
||||
=======
|
||||
path: '/alarmInfo/list',
|
||||
>>>>>>> origin/develop
|
||||
label: '报警管理',
|
||||
icon: 'alarm_on',
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue