From 39d967a45c6b9834e943e670e8d8ea15b505beb1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 三月 2019 18:29:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java |   12 ++++++------
 1 files changed, 6 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 48ed1c6..857d71e 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
@@ -16,7 +16,7 @@
 	 * @param content
 	 * @throws PushException
 	 */
-	void pushGoods(Long uid, Long auctionId, String title, String content, List<String> listVersion) throws PushException;
+	void pushGoods(Long uid, Long auctionId, String title, String content, String versions) throws PushException;
 
 	/**
 	 * 鎺ㄩ�侀摼鎺�
@@ -27,7 +27,7 @@
 	 * @param content
 	 * @throws PushException
 	 */
-	void pushUrl(Long uid, String url, String title, String content, List<String> listVersion) throws PushException;
+	void pushUrl(Long uid, String url, String title, String content, String versions) throws PushException;
 
 	/**
 	 * 鎺ㄩ�佺珯鍐呬俊
@@ -37,7 +37,7 @@
 	 * @param content
 	 * @throws PushException
 	 */
-	void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX, List<String> listVersion) throws PushException;
+	void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX, String versions) throws PushException;
 
 	/**
 	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�亀eex椤甸潰
@@ -48,7 +48,7 @@
 	 * @param weexUrl
 	 * @throws PushException
 	 */
-	void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listVersion) throws PushException;
+	void pushWEEX(Long uid, String title, String content, String weexUrl, String versions) throws PushException;
 
 	/**
 	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�佺櫨宸濈綉椤�
@@ -59,7 +59,7 @@
 	 * @param url
 	 * @throws PushException
 	 */
-	void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listVersion) throws PushException;
+	void pushBaiChuanUrl(Long uid, String title, String content, String url, String versions) throws PushException;
 
 	/**
 	 * 鎺ㄩ�佺鍒╀腑蹇冿紙鐗堟湰鍙�:1.5.1鍚庯級
@@ -69,5 +69,5 @@
 	 * @param content
 	 * @throws PushException
 	 */
-	void pushWelfareCenter(Long uid, String title, String content, List<String> listVersion) throws PushException;
+	void pushWelfareCenter(Long uid, String title, String content, String versions) throws PushException;
 }

--
Gitblit v1.8.0