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

kaiyu

2021-09-14 82841afc4e140f72fdeb378102e0e9a978bbe14c

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