Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-10 ef431a71ed043e8fb63777793df23c110b853803

 src/main/java/com/moral/service/DeviceService.java

@@ -38,4 +38,6 @@
   List<Device> getDevicesByMonitorPointId(Integer monitorPointId);



   List<Map<String,String>> queryDevicesState(List<String> macList,Boolean withData);



   Device queryById(Integer id);

}