From 50ee957edb625dfea478496127099eee13bd0f79 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期三, 21 十一月 2018 16:38:30 +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 0ea3183..75d4dd9 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
@@ -33,7 +33,7 @@
 	 * @param device
 	 * @return
 	 */
-	public DeviceTokenIOS getDeviceTokenByDevice(String device);
+	public DeviceTokenIOS getDeviceTokenByDeviceToken(String deviceToken);
 
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID鑾峰彇DeviceToken

--
Gitblit v1.8.0