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

cjl

2023-08-23 5f7d27060aeca3f23737db21e06fc07c8e28f1a8

 screen-manage/src/main/java/com/moral/api/service/impl/OrganizationUnitAlarmServiceImpl.java

@@ -92,6 +92,7 @@
        OrganizationUnitAlarm newRecord = organizationUnitAlarmMapper.selectById(organizationUnitAlarm.getId());
        //刷新deviceInfo缓存
        CacheUtils.refreshDeviceAlarmInfo();
        CacheUtils.refreshSpecialDeviceAlarmInfo();
        //封装返回对象
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());