From 3d92fcd729376c584a07d5f23b8e06f81fbcbcde Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 16:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java
index 6fee5b3..b7c6fca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java
@@ -148,10 +148,11 @@
 	 * 鍥㈤槦鏀剁泭娑堟伅
 	 * @param uid
 	 * @param money 鏈鍒拌处閲戦
+	 * @param subsidy 琛ヨ创閲戦
 	 * @param balance 浣欓
 	 * @param receivedDate  缁撶畻鏈堝害
 	 */
-	public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate);
+	public void teamReceive(Long uid, BigDecimal money,BigDecimal subsidy,  BigDecimal balance, Date receivedDate);
 
 	/**
 	 * 浣跨敤濂栧姳鍒�

--
Gitblit v1.8.0