Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

 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")