Merge branch 'wb' into qa

cjl

2023-09-27 f0a5a28345ed6764ac033a585f1e6b7cbcf8d102

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