From 8e33ede9353a886e46c113a7556fea63eb402672 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 23 Mar 2018 15:08:55 +0800
Subject: [PATCH] 报表 优化

---
 src/main/java/com/moral/controller/ReportController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/controller/ReportController.java b/src/main/java/com/moral/controller/ReportController.java
index f2058a8..d5dd547 100644
--- a/src/main/java/com/moral/controller/ReportController.java
+++ b/src/main/java/com/moral/controller/ReportController.java
@@ -35,7 +35,7 @@
 		return new ResultBean<Map<String,List<Object>>>(demo);
 	}
 	@PostMapping("line-chart")
-	public ResultBean <List<List<PairData>>> lineChart(@RequestBody LineChartCriteria lineChartCriteria){
+	public ResultBean <Map<String, List<List<PairData>>>> lineChart(@RequestBody LineChartCriteria lineChartCriteria){
 		return  new ResultBean<>(historyMinutelyService.queryLineChartDateByCrieria(lineChartCriteria));
 	}
 	@GetMapping("excel")

--
Gitblit v1.8.0