Merge branch 'cjl' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-09-22 e8242c8c4b69a52bd49fd0b5b49333e1d227e405

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