From 1f65fd011582ac6587d60475315d2ee6662d9d5b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 08 Sep 2023 09:01:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java
index 672f3c3..6fbe308 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organizationUnitAlarm/OrganizationUnitAlarmVO.java
@@ -24,5 +24,5 @@
 
     private String showUnitKey;
 
-    private List<Integer> alarmLevel;
+    private String alarmLevel;
 }

--
Gitblit v1.8.0