Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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);



   /**

    * 还原普通模板