Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

 src/main/java/com/moral/service/HistoryMinutelyService.java

@@ -17,5 +17,5 @@
   Map<String, Object> getMonthAverageBySensor(Map<String, Object> parameters);





    List<List<PairData>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);

    Map<String, List<List<PairData>>> queryLineChartDateByCrieria(LineChartCriteria lineChartCriteria);

}