Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java

@@ -205,8 +205,7 @@


         data.put("clickUrl", url);

         data.put("token", taoBaoLink.getTaoToken());

         data.put("rule",

               "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");

         data.put("rule", configService.get("share_single_goods_rule"));

         data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));



         String shareText = "";