From d222232204b5ba3d3039ae8689dad743ea06723f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 09:12:51 +0800
Subject: [PATCH] Merge branch 'master' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceActiveService.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceActiveService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceActiveService.java
index 5b8f839..c9661cc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceActiveService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceActiveService.java
@@ -13,10 +13,20 @@
 
 	/**
 	 * 
-	 * @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);
+
 }

--
Gitblit v1.8.0