Merge remote-tracking branch 'origin/master'

沈斌

2017-11-15 ad42a81e625f1e7a982a94994d7d5f3314c71fbd

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

@@ -14,7 +14,5 @@


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



   String getMacLogByLast(); 


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

}