Merge remote-tracking branch 'origin/master'

沈斌

2017-11-28 70c4207810e4348ad9c125c44cbb6842ecd8b4b7

 src/main/java/com/moral/monitor/dao/HistoryEntityMapper.java

@@ -13,4 +13,6 @@
   List<Map<String, Object>> getAverageByAll(Map<String, Object> parameters);



   List<Map<String, Object>> getEquipmentStates(Map<String, Object> parameters); 



   List<Map<String, Object>> getSensorsAverageByEquipment(Map<String, Object> parameters);

}