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

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java
index fa669e3..a8179ed 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java
@@ -47,11 +47,12 @@
 	 * @param orderId
 	 * @param payMoney
 	 * @param money
+	 * @param subsidy 琛ヨ创
 	 * @param goodsCount
 	 * @param orderState
 	 */
 	public void orderInviteStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
-			int goodsCount, int orderState, Date downTime);
+			BigDecimal subsidy, int goodsCount, int orderState, Date downTime);
 
 
 

--
Gitblit v1.8.0