Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

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

@@ -1,5 +1,8 @@
package com.moral.service;



import com.moral.entity.charts.LineChartCriteria;

import com.moral.entity.charts.PairData;



import java.util.List;

import java.util.Map;



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





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

}