Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

 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()));

      }