From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java
index 63d9722..f348d97 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsTextTemplateService.java
+++ b/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);
 
 	/**
 	 * 杩樺師鏅�氭ā鏉�

--
Gitblit v1.8.0