Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

fengxiang

2017-11-15 b8e86e2b44b796ced6f8fa557dfee532749dcc6c

 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);

}