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

jinpengyong

2023-11-10 4686da41b376617f6d447b3546c045ce54f032fa

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