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

jinpengyong

2023-11-15 84e740f362d574b942b1c9a274425841c9167de8

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