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

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

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