From f823c16e9260df01275a6247e5706079d9bef07b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 02 八月 2019 17:55:44 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index bcc9639..3e81ef9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -114,7 +114,7 @@
 	 * @return
 	 */
 	public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
-			String endTime);
+			String endTime, Integer source);
 
 	/**
 	 * 鏍规嵁鏉′欢缁熻

--
Gitblit v1.8.0