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

cjl

2023-09-03 b3a56423e65c33c2c2cc905cb5a0b6af6f1601e7

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

}