Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 ae3e722d471d7e844acd25f124a1fec42ac714a0

 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java

@@ -363,6 +363,13 @@
               swiperPicture.setParams("");

            }

            



            String remark = swiperPicture.getRemark();

            if (remark == null) {

               swiperPicture.setRemark("");

            }

				
				
            JumpDetailV2 jumpDetail = swiperPicture.getJumpDetail();

            if (jumpDetail == null) {

               // 默认未选择