Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-14 8e751a7ee99afce71ac615a6111228c5c785ee46

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java

@@ -808,7 +808,7 @@
      extraVO.setShare(shareInfoVO);



      if (convertUrl != null) {

         extraVO.setCouponJumpLink(convertUrl.getShortUrl());

         extraVO.setCouponJumpLink(convertUrl.getUrl());

         extraVO.setNativeCouponJumpLink(PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));

      }