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

疯狂的狮子li

2021-07-02 d6ca9e548d9c11be3281de1ddae392e276dc2a3d

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

 ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -205,9 +205,9 @@
     * @param hKeys Hash键集合
     * @return Hash对象集合
     */
    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
        RListMultimap rListMultimap = redissonClient.getListMultimap(key);
        return rListMultimap.getAll(hKeys);
    public <K,V> Map<K,V> getMultiCacheMapValue(final String key, final Set<K> hKeys) {
        RMap<K,V>  rMap = redissonClient.getMap(key);
        return rMap.getAll(hKeys);
    }

    /**