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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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