Merge remote-tracking branch 'origin/master'

yujian

2019-07-18 0a3e5a876724ac247b33632300701077098111eb

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java

@@ -83,4 +83,9 @@
      return deviceActive;

   }



   @Override

   public DeviceActive getFirstActiveInfo(String device) {

      return deviceActiveMapper.selectFirst(device);

   }



}