From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
index 923f122..3824978 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java
@@ -23,8 +23,8 @@
 	 * @param channel
 	 * @return
 	 */
-	List<Map<String, Object>> countOrderNumber( @Param("dateType") Integer dateType, @Param("year") String year, 
-			@Param("startTime")String startTime, @Param("endTime")String endTime);
+	List<Map<String, Object>> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year, 
+			@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceType") int sourceType);
 
 	
 	/**

--
Gitblit v1.8.0