From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/money/msg/UserMoneyMsgNotificationService.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 cdc3eee..3d52938 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
@@ -155,10 +155,6 @@
 	 */
 	public void extractAuto(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, String beiZhu);
 
-	/**
-	 * 绾㈠寘娑堟伅
-	 */
-	public void redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu);
 	
 	/**
 	 * 琛ヨ创娑堟伅
@@ -171,4 +167,14 @@
 	 */
 	public void inviteOrderSubSidy(Long uid, Date date, String from, BigDecimal money, BigDecimal balance);
 
+	/**
+	 * 绾㈠寘娑堟伅
+	 */
+	public void redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu);
+
+	/**
+	 * 绾㈠寘娑堟伅-闃熷弸濂栧姳
+	 */
+	public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type, BigDecimal money, String stateDesc,String content);
+	
 }

--
Gitblit v1.8.0