Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-03-26 b4aa377b5e7898cd2ef018cc385a19af67a56839

 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<Double>>>> lineChart(@RequestBody LineChartCriteria lineChartCriteria){

      return  new ResultBean<>(historyMinutelyService.queryLineChartDateByCrieria(lineChartCriteria));

   }

   @GetMapping("excel")