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

admin

2020-02-28 4b158de47e9231c17c661617115c746cdd1445d9

 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/FloatADServiceImpl.java

@@ -68,6 +68,8 @@
         record.setParams(null);

      } else if (!StringUtil.isJson(params)) {

         throw new FloatADException(1, "跳转参数非JSON格式");

      } else {

         record.setParams(params.trim());

      }

      

      FloatADTypeEnum typeEnum = record.getTypeEnum();