Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-28 e702400b2e1bfd27f6176ea95a5c4d130417a1a4

 screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -64,6 +64,6 @@
    }

    private Map<String, Object> getDataFromRedis(String mac) {
        return (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE_DATA + "_" + mac);
        return (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE_DATA + mac);
    }
}