Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca

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

@@ -42,4 +42,6 @@
   Device queryById(Integer id);



   List<Device> getDevicesByProfessionId(Map<String, Object> parameters);



   List<Device> getDevicesByOrganizationId(Map<String, Object> parameters);

}