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

cjl

2023-09-28 10b5e4880762d517c857ae76b098b8749a261fb0

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