Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-24 2ba93435afce9b04a5247739041902861b20596c

 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;
}