Merge remote-tracking branch 'origin/div' into div

admin

2019-08-29 f21dfb5fc990174724f3f37b07be2c21fa618769

 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);

   }



}