Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 f7fc1e040ca7533b0bece2a02eb72dd3645ed4d0

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

   }



}