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/impl/push/HWPushServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
index aeede11..9040384 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
@@ -30,7 +30,7 @@
private DeviceTokenHWService deviceTokenHWService;
@Override
- public void pushGoods(Long uid, Long auctionId, String title, String content) throws PushException {
+ public void pushGoods(Long uid, Long auctionId, String title, String content, List<String> listVersion) throws PushException {
String gid = auctionId + "";
JSONObject json = new JSONObject();
json.put("url", "");
@@ -83,7 +83,7 @@
}
@Override
- public void pushUrl(Long uid, String url, String title, String content) throws PushException {
+ public void pushUrl(Long uid, String url, String title, String content, List<String> listVersion) throws PushException {
JSONObject json = new JSONObject();
json.put("url", url);
json.put("type", "url");
@@ -152,7 +152,7 @@
}
@Override
- public void pushZNX(Long uid, AccountMessage msg, SystemZnx systemZNX) throws PushException {
+ public void pushZNX(Long uid, AccountMessage msg, SystemZnx systemZNX, List<String> listVersion) throws PushException {
JSONObject contentJson = new JSONObject();
contentJson.put("isOpen", 0);
@@ -204,19 +204,19 @@
}
@Override
- public void pushWEEX(Long uid, String title, String content, String weexUrl) throws PushException {
+ public void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listVersion) throws PushException {
// TODO 鎺ㄩ�亀eex椤甸潰
}
@Override
- public void pushBaiChuanUrl(Long uid, String title, String content, String url) throws PushException {
+ public void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listVersion) throws PushException {
// TODO 鎺ㄩ�佹窐瀹㈢櫨宸濋摼鎺�
}
@Override
- public void pushWelfareCenter(Long uid, String title, String content) throws PushException {
+ public void pushWelfareCenter(Long uid, String title, String content, List<String> listVersion) throws PushException {
// TODO Auto-generated method stub
}
--
Gitblit v1.8.0