Merge remote-tracking branch 'origin/master'

沈斌

2017-10-29 84fa4cc7d487e90f59f241a266f44299903dfbfa

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