From 0753e8e2febe83f13d9d7a6071fa5f7b57d7d7f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 八月 2019 10:28:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java
index c839151..bd79bef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java
@@ -4,6 +4,7 @@
 import java.util.Date;
 import java.util.List;
 
+import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinGiveRecord;
 import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
 import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport;
 import com.yeshi.fanli.entity.bus.user.UserRank;
@@ -153,8 +154,8 @@
 	/**
 	 * 绾㈠寘璧犻�侀��鍥�
 	 * @param uid
-	 * @param money
+	 * @param UserTaoLiJinGiveRecord record
 	 * @throws UserTaoLiJinOriginException
 	 */
-	public void giveSendBack(Long uid, BigDecimal money) throws UserTaoLiJinOriginException;
+	public void giveSendBack(Long uid, UserTaoLiJinGiveRecord record) throws UserTaoLiJinOriginException;
 }

--
Gitblit v1.8.0