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

jinpengyong

2023-08-25 1267661c4028d4adb6629b3c6f00c686aa35eb8a

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