Merge remote-tracking branch 'origin/master'

沈斌

2017-11-11 45be44fb95325305373647231ef74e72d1501f8c

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