Merge branch 'master_develop' into div_develop

yujian

2019-05-13 f6ce3fd74c60cb204372b01bc68467c0ed180da7

 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);

   }



   /**