Merge branch 'mater-1.6.0' into div

admin

2019-08-26 6dfb2927b54705110d2f0cd8eaf17558b336b7b1

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

   }



}