From 0fc3ad6964436013152d08f6f67920b1f4fbcca2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 09 十一月 2018 10:45:27 +0800
Subject: [PATCH] 冲突解决

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/IOSPushService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/IOSPushService.java
index d278e7c..0ea3183 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/IOSPushService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/IOSPushService.java
@@ -20,7 +20,7 @@
 	 * @param deviceToken
 	 * @param device
 	 */
-	public void addDeviceToken(Long uid, String deviceToken, String device);
+	public void addDeviceToken(Long uid,int version, String deviceToken, String device);
 
 	/**
 	 * 鏇存柊璁惧鐨刣eviceToken

--
Gitblit v1.8.0