Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

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