Merge branch 'mater-1.6.0' into div

admin

2019-08-22 d80640689e6949780811f4f8d1c8c972dbd4aa0b

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

   }



}