Merge remote-tracking branch 'origin/master'

yujian

2019-07-12 9d8dfb01ff72c57abad3b80f3d65e81a5354db03

 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java

@@ -64,7 +64,7 @@
    * @return

    */

   public String createContentByTemplate(String template, Long uid, TaoBaoGoodsBrief goods,String token,

         String shortLink, boolean hasCoupon, String from);

         String shortLink, boolean hasCoupon, Long tljId);



   /**

    * 还原普通模板