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

cjl

2023-09-28 ff65dc92b93fe082e4e3b26cd949ebf6ece554e1

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