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

jinpengyong

2023-09-26 b9086588c215b7493682d65d49ed1070d88c3058

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