Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -474,4 +474,10 @@
      return deviceMapper.getDevicesByProfession(parameters);

   }



   @Override

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

      ValidateUtil.notNull(parameters.get("organizationId"), "param.is.null");

      return deviceMapper.getDevicesByOrganizationId(parameters);

   }



}