Merge remote-tracking branch 'origin/master'

fengxiang

2018-01-26 e125b445697a6b8c2b5cc5c57f31249c5088c1c9

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

@@ -151,5 +151,12 @@
      }

   }



   @Override

   public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {

      Device device = new Device();

      device.setMonitorPointId(monitorPointId);

      device.setIsDelete(Constants.IS_DELETE_FALSE);

      return deviceMapper.select(device);

   }



}