From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java b/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
index 4c6aaac..0f48288 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
@@ -553,7 +553,7 @@
 	 */
 	public Class<?> getObj(Class<?> clazz, String key) {
 		String value = getCommonString(key);
-		return new Gson().fromJson(value, clazz);
+		return (Class<?>) new Gson().fromJson(value, clazz);
 	}
 
 	/**

--
Gitblit v1.8.0