Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-15 8efcc21de04bd7f7d784dac97e86e76e1a3ab930

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

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



import java.util.Date;

import java.util.Map;





@@ -9,4 +10,5 @@


   Map<String, Object> getDeviceRankingBySensorAverage(Map<String, Object> parameters);



    String queryValueByMacAndTime(String mac, Date time);

}