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

admin

2019-07-23 dc675e0c19849b1d1a77c64f0b5c6a25eb91ace2

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

@@ -705,7 +705,7 @@
      }



      shareText = shareText.replace("{店铺类型}", shopType)

            .replace("{月销量}", PinDuoDuoUtil.getSaleCount(goods.getSoldQuantity())).replace("{领券短链}", shortLink)

            .replace("{月销量}", goods.getSalesTip()).replace("{领券短链}", shortLink)

            .replace("{淘口令}", null);

      shareInfo.setShareText(shareText);