Merge remote-tracking branch 'origin/master'

admin

2019-04-15 debb3a579f798d71072f037f74e3e6b43b5fe0ee

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

@@ -109,6 +109,11 @@
         e.printStackTrace();

      }

      

      String remark = record.getRemark();

      if (remark != null && (remark.trim().length() == 0 || remark.equalsIgnoreCase("null"))) {

         record.setRemark(null);

      }

		
      

      String picture = null;

      if (file != null) {