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

kaiyu

2021-07-13 91a88471d84246524548a318aec1f22735cfedc9

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