From ee88b54979c633a4ade518d4c124a2d07d378562 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 十月 2019 10:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java
index 11c4dab..2894810 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java
@@ -1,8 +1,8 @@
 package com.yeshi.fanli.service.inter.count;
 
 import java.util.List;
-import java.util.Map;
 
+import com.yeshi.fanli.dto.ChartTDO;
 import com.yeshi.fanli.vo.user.SystemCouponVO;
 import com.yeshi.fanli.vo.user.UserSystemCouponCountVO;
 
@@ -82,7 +82,7 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<Map<String, Object>> getRebateCouponUsedNumToCharts(Integer dateType, String year, String startTime,
+	public List<ChartTDO> getRebateCouponUsedNumToCharts(Integer dateType, String year, String startTime,
 			String endTime);
 
 	/**
@@ -93,7 +93,7 @@
 	 * @param endTime
 	 * @return
 	 */
-	public List<Map<String, Object>> getRebateCouponMoneyToCharts(Integer dateType, String year, String startTime,
+	public List<ChartTDO> getRebateCouponMoneyToCharts(Integer dateType, String year, String startTime,
 			String endTime);
 
 	/**
@@ -105,7 +105,7 @@
 	 * @param couponType
 	 * @return
 	 */
-	public List<Map<String, Object>> getFreeCouponMoneyToCharts(Integer dateType, String year, String startTime,
+	public List<ChartTDO> getFreeCouponMoneyToCharts(Integer dateType, String year, String startTime,
 			String endTime, String couponType);
 	
 }

--
Gitblit v1.8.0