From e57271b299b6568fd00e8046b79befbb1f224d2c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 14 五月 2019 15:06:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceActiveService.java |    8 ++++++++
 1 files changed, 8 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..5b8f839 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,12 @@
 	 */
 	public void addDeviceActive(DeviceActive deviceActive);
 
+	/**
+	 * 
+	 * @param device 璁惧鍙�
+	 * @param platform 骞冲彴绫诲瀷
+	 * @return
+	 */
+	public DeviceActive getDeviceByDeviceAndPlatform(String device, String deviceToken, String platform);
+	
 }

--
Gitblit v1.8.0