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

cjl

2023-07-07 1e6dbe352c35a54c299008c523e38b1e59d1ea03

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