Merge branch 'master' into div

yujian

2019-07-12 b6f6df531ab4fdaf2b800f67eb116323e07797e4

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

   }



}