Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-15 8efcc21de04bd7f7d784dac97e86e76e1a3ab930

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

@@ -418,4 +418,10 @@
      return deviceMapper.selectByPrimaryKey(id);

   }



   @Override

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

		
      return deviceMapper.getDevicesByProfession(parameters);

   }



}