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

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java
index b1b7000..4883178 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java
@@ -41,10 +41,11 @@
 	 * 鏍规嵁璁㈠崟鍙峰拰璁㈠崟鏉ユ簮鑾峰彇鏁伴噺
 	 * 
 	 * @param orderNo
-	 * @param type
+	 * @param hongBaotype
+	 * @param sourceType
 	 * @return
 	 */
-	public long countByOrderNoAndHongBaoType(String orderNo, int type);
+	public long countByOrderNoAndHongBaoType(String orderNo, int hongBaotype, int sourceType);
 	
 	/**
 	 * 鑾峰彇璇︽儏

--
Gitblit v1.8.0