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

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

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

@@ -329,6 +329,7 @@
        return resultMap;
    }

    @Override
    public Map<String,Sensor> getAllSensorFromCache(){
        Map<String,Sensor> sensors = redisTemplate.opsForHash().entries(RedisConstants.SENSOR_KEY);
        if(ObjectUtils.isEmpty(sensors))