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

admin

2020-02-28 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0

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

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

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

	
   /**

    * 根据IMEI查询

    * @param imei

    * @return

    */

   public DeviceActive getFirstActiveInfoByImei(String imei);



}