From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 12 三月 2019 16:29:55 +0800 Subject: [PATCH] 冲突提交 --- fanli/src/main/java/com/yeshi/fanli/service/inter/push/IOSPushService.java | 5 ++--- 1 files changed, 2 insertions(+), 3 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 d2b8bf7..089d3c7 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 @@ -4,7 +4,6 @@ import com.yeshi.fanli.entity.push.DeviceTokenIOS; import com.yeshi.fanli.entity.push.PushQueueRecord; -import com.yeshi.fanli.exception.PushException; /** * IOS鎺ㄩ�佹湇鍔� @@ -21,7 +20,7 @@ * @param deviceToken * @param device */ - public void addDeviceToken(Long uid, int version, String deviceToken, String device); + public void addDeviceToken(Long uid, int version, String deviceToken, String device); /** * 鏇存柊璁惧鐨刣eviceToken @@ -44,7 +43,7 @@ * @param uid * @return */ - public List<DeviceTokenIOS> getDeviceTokenListByUid(Long uid); + public List<DeviceTokenIOS> getDeviceTokenListByUid(Long uid, List<String> listVersion); /** * 鑾峰彇DeviceToken涓嶄负绌虹殑鍒楄〃 -- Gitblit v1.8.0