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

admin

2020-01-08 dddbd7fc24aec7d71522641da8bf3804b1b858fd

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

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


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

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

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

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

        } else {

            record.setParams(params.trim());

        }



        String startTime_str = record.getStartTime_str();


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

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

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

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

        } else {

            record.setParams(params.trim());

        }



        if (!StringUtil.isNullOrEmpty(jumpType)) {