Merge branch 'master' into div

yujian

2019-07-12 b6f6df531ab4fdaf2b800f67eb116323e07797e4

 fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceActiveService.java

@@ -11,4 +11,22 @@
    */

   public void addDeviceActive(DeviceActive deviceActive);



   /**

    * 
    * @param device

    *            设备号

    * @param platform

    *            平台类型

    * @return

    */

   public DeviceActive getDeviceByDeviceAndPlatform(String device, String deviceToken, String platform);



   /**

    * 获取设备的注册时间

    * 
    * @param device

    * @return

    */

   public DeviceActive getFirstActiveInfo(String device);



}