Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-28 7daaf245531a944bf9ea737e8a1c2d6fda51c10c

 ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java

@@ -195,6 +195,14 @@
        }
    }

    public <T> void setCacheMap(final String key, final Map<String, T> dataMap, long timeout)
    {
        if (dataMap != null) {
            redisTemplate.opsForHash().putAll(key, dataMap);
            redisTemplate.expire(key, timeout, TimeUnit.SECONDS);
        }
    }

    /**
     * 获得缓存的Map
     *