From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceActiveService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 227e73e..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
@@ -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);
+
 }

--
Gitblit v1.8.0