Merge branch 'master' into div

yujian

2019-07-16 a503900f405a39f3aa30a8663ca661cf3c6b55ea

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

   }



}