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

cjl

2023-07-10 6344a8b6b7e2853dbfa9e6506ff2e17a31930297

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