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

cjl

2023-07-19 43c631ad573535f4434caf19423824d4bd3f8ca7

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

@@ -35,4 +35,7 @@
    //根据设备id查询设备组织，维护人等信息
    SpecialDeviceInfoDTO selectDeviceInfoDTOById(Integer deviceId);

    //特殊设备数据校准
    Map<String,Object> adjustSpecialDeviceData(Map<String,Object> deviceData);

}