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/order/LostOrderService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java
index 0456fdc..f641c17 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/LostOrderService.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import com.yeshi.fanli.dto.ChartTDO;
 import com.yeshi.fanli.entity.bus.user.LostOrder;
 
 public interface LostOrderService {
@@ -106,10 +107,10 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Map<String, Object>> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,
+	public List<ChartTDO> countLostNum(Integer dateType, Integer resultCode, String year, String startTime,
 			String endTime) throws Exception;
 
-	public List<Map<String, Object>> countAppealMoney(Integer dateType, String year, String startTime, String endTime)
+	public List<ChartTDO> countAppealMoney(Integer dateType, String year, String startTime, String endTime)
 			throws Exception;
 
 	/**

--
Gitblit v1.8.0