Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5SwiperPictureController.java

@@ -39,7 +39,6 @@
         return;

      }



      try {

         

         List<SwiperPicture> list = swiperPictureService.getByBannerCard(card);

         if (list == null || list.size() == 0) {

@@ -64,9 +63,6 @@
         

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

         

      } catch (SwiperPictureException e) {

         e.printStackTrace();

      }

   }



}