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

admin

2019-08-02 90b211c63f9d596aa90b508f76eb916a30b68731

 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;

   }