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

yujian

2019-08-02 566f56c649205565f20bac598f29f81407b4b3d0

 fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoApiUtil.java

@@ -299,7 +299,7 @@
   public static String getPromotionUrl(Long goodsId, String pid, String customParams) {

      PDDPromotionUrl promotion = convert(goodsId, pid, customParams);

      if (promotion != null) {

         return promotion.getUrl();

         return promotion.getShortUrl();

      }

      return null;

   }