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

jinpengyong

2023-08-25 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3

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

@@ -56,7 +56,7 @@
    Map<String, Object> getDeviceByMac(String mac);

    //设备数据校准
    Map<String, Object> adjustDeviceData(Map<String, Object> deviceData);
    Map<String, Object> adjustDeviceData(Map<String, Object> deviceData,String code);

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