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

jinpengyong

2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be

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

@@ -58,6 +58,9 @@
    //设备数据校准
    Map<String, Object> adjustDeviceData(Map<String, Object> deviceData);

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

    //判断并修改设备状态
    void judgeDeviceState(Map<String, Object> data);