From 325009946e7c987c4b087509ffef5087f8b3d09a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 14 一月 2019 11:19:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java |    3 ++-
 1 files changed, 2 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 9cf2e97..8b3d681 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
@@ -2,6 +2,7 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 
 
@@ -48,5 +49,5 @@
 	 * 缁熻鏂板鐢ㄦ埛
 	 * @return
 	 */
-	public List<Object>  countNewUserByDate(Integer type,String years, String startTime, String endTime) throws Exception;
+	public List<Map<String, Object>> countNewUserByDate(Integer type,String years, String startTime, String endTime) throws Exception;
 }

--
Gitblit v1.8.0