Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -13,10 +13,27 @@


   /**

    * 

    * @param device 设备号

    * @param platform 平台类型

    * @param device

    *            设备号

    * @param platform

    *            平台类型

    * @return

    */

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



   /**

    * 获取设备的注册时间

    * 
    * @param device

    * @return

    */

   public DeviceActive getFirstActiveInfo(String device);

   

   /**

    * 根据IMEI查询

    * @param imei

    * @return

    */

   public DeviceActive getFirstActiveInfoByImei(String imei);



}