From c53f14a5c5d0bb6623987de84ef1bb8f8a8dbb3f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 18:13:24 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java
index 8b3d681..dd2a19f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java
@@ -49,5 +49,9 @@
 	 * 缁熻鏂板鐢ㄦ埛
 	 * @return
 	 */
-	public List<Map<String, Object>> countNewUserByDate(Integer type,String years, String startTime, String endTime) throws Exception;
+	public List<Map<String, Object>> countNewUserByDate(String channel,Integer type,String years, String startTime, String endTime) throws Exception;
+
+	
+	public List<Map<String, Object>> getTodayBuyRate(String channel, Integer type, String years, String startTime,
+			String endTime) throws Exception;
 }

--
Gitblit v1.8.0