From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceTokenHWService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceTokenHWService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceTokenHWService.java
index bb36918..f04ab1c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceTokenHWService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/DeviceTokenHWService.java
@@ -47,4 +47,12 @@
 	 */
 	void unBindDeviceToken(String device);
 
+	/**
+	 * 灏嗙敤鎴稩D缁戝畾鍒拌澶囦笂
+	 * 
+	 * @param device
+	 * @param uid
+	 */
+	void bindUid(String device, Long uid);
+
 }

--
Gitblit v1.8.0