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

yujian

2019-08-22 11c098089f8c4714188e91032e5a19e8fe94bf96

 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java

@@ -549,7 +549,7 @@
         hasCoupon = false;

      }

      

      String jumpLink = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_SHARE + "", uid);

      String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(id, PinDuoDuoApiUtil.PID_SHARE + "", uid);

      

      JSONObject data = new JSONObject();

      data.put("imgs", imageList);