Merge remote-tracking branch 'origin/div' into div

admin

2020-04-24 51c0049fb70c85bf515dc0fecd96bf13ca23aa28

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

@@ -1342,6 +1342,7 @@
      PDDPromotionUrl convertUrl = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_FANLI + "", uid + "");

      JSONObject data = new JSONObject();

      data.put("native", true);



      data.put("jumpLink", convertUrl.getUrl());

      data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));

      out.print(JsonUtil.loadTrueResult(data));