Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-24 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16

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

@@ -476,6 +476,7 @@


   @Override

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

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

      return deviceMapper.getDevicesByOrganizationId(parameters);

   }