Merge remote-tracking branch 'origin/master'

admin

2018-12-12 263d995ed175dc8260b0f830751db376221e4ac9

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java

@@ -382,13 +382,6 @@
      

      FileUploadResult shareImg = createShareImg(userShareGoodsRecord, listGoodsBrief);

      

      // 短连接

      String shortLink = HttpUtil.getShortLink(shareImg.getUrl());

      if (!StringUtil.isNullOrEmpty(shortLink)) {

         shareImg.setUrl(shortLink);

      }

		
		
      if (listGroup.size() > 0) {

         userShareGoodsGroupService.insertBatch(listGroup);

      }