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/BasePushService.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java index 5e17fac..48ed1c6 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java @@ -1,5 +1,7 @@ package com.yeshi.fanli.service.inter.push; +import java.util.List; + import com.yeshi.fanli.entity.bus.user.AccountMessage; import com.yeshi.fanli.entity.system.SystemZnx; import com.yeshi.fanli.exception.PushException; @@ -14,7 +16,7 @@ * @param content * @throws PushException */ - void pushGoods(Long uid, Long auctionId, String title, String content) throws PushException; + void pushGoods(Long uid, Long auctionId, String title, String content, List<String> listVersion) throws PushException; /** * 鎺ㄩ�侀摼鎺� @@ -25,7 +27,7 @@ * @param content * @throws PushException */ - void pushUrl(Long uid, String url, String title, String content) throws PushException; + void pushUrl(Long uid, String url, String title, String content, List<String> listVersion) throws PushException; /** * 鎺ㄩ�佺珯鍐呬俊 @@ -35,7 +37,7 @@ * @param content * @throws PushException */ - void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX) throws PushException; + void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX, List<String> listVersion) throws PushException; /** * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�亀eex椤甸潰 @@ -46,7 +48,7 @@ * @param weexUrl * @throws PushException */ - void pushWEEX(Long uid, String title, String content, String weexUrl) throws PushException; + void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listVersion) throws PushException; /** * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�佺櫨宸濈綉椤� @@ -57,7 +59,7 @@ * @param url * @throws PushException */ - void pushBaiChuanUrl(Long uid, String title, String content, String url) throws PushException; + void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listVersion) throws PushException; /** * 鎺ㄩ�佺鍒╀腑蹇冿紙鐗堟湰鍙�:1.5.1鍚庯級 @@ -67,5 +69,5 @@ * @param content * @throws PushException */ - void pushWelfareCenter(Long uid, String title, String content) throws PushException; + void pushWelfareCenter(Long uid, String title, String content, List<String> listVersion) throws PushException; } -- Gitblit v1.8.0