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

fengxiang

2017-11-13 999d8a80d9a1c1f20033c29e7e2a08951766bee8

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



   String getMacLogByLast(); 
}