From e1838b3114d679b8d0e7cceff80e2114e80e69ea Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 16:50:18 +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