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

jinpengyong

2023-08-18 4a64c0801f147536ed0a9d09977941f313a286ae

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