Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-02 57cb796b40a983afcff66edf967e2a1eb513b870

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

@@ -59,11 +59,6 @@
   }

   

   @Override

   public List<Map<String, Object>> getSensorsByDevice(String mac) {

      return deviceMapper.getSensorsByDevice(mac);

   }



   @Override

   @Transactional

   public void saveOrUpdateDevice(Device device) {

      ValidateUtil.notNull(device, "param.is.null");