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/PushService.java |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java
index 2129dc0..015a340 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java
@@ -7,65 +7,77 @@
 public interface PushService {
 	/**
 	 * 鎺ㄩ�佸晢鍝�
-	 * 
 	 * @param uid
 	 * @param url
 	 * @param title
 	 * @param content
+	 * @param listIOS
+	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushGoods(Long uid, String url, String title, String content, List<String> listVersion) throws PushException;
+	void pushGoods(Long uid, String url, String title, String content, List<String> listIOS,
+			List<String> listAndroid) throws PushException;
 
 	/**
 	 * 鎺ㄩ�侀摼鎺�
-	 * 
 	 * @param uid
 	 * @param url
 	 * @param title
 	 * @param content
+	 * @param listIOS
+	 * @param listAndroid
 	 * @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,List<String> listIOS,
+			List<String> listAndroid) throws PushException;
 
 	/**
 	 * 鎺ㄩ�佺珯鍐呬俊
-	 * 
 	 * @param uId
 	 * @param title
 	 * @param content
+	 * @param listIOS
+	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushZNX(Long uId, String title, String content, List<String> listVersion) throws PushException;
+	void pushZNX(Long uId, String title, String content, List<String> listIOS,
+			List<String> listAndroid) throws PushException;
 
 	/**
 	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�亀eex椤甸潰
-	 * 
 	 * @param uid
 	 * @param title
 	 * @param content
 	 * @param weexUrl
+	 * @param listIOS
+	 * @param listAndroid
 	 * @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, List<String> listIOS,
+			List<String> listAndroid) throws PushException;
 
 	/**
 	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚� 鎺ㄩ�佺櫨宸濈綉椤�
-	 * 
 	 * @param uid
 	 * @param title
 	 * @param content
 	 * @param url
+	 * @param listIOS
+	 * @param listAndroid
 	 * @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, List<String> listIOS,
+			List<String> listAndroid) throws PushException;
 
 	/**
 	 * 鎺ㄩ�佺鍒╀腑蹇�
-	 * 
 	 * @param uid
 	 * @param title
 	 * @param content
+	 * @param listIOS
+	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushWelfareCenter(Long uid, String title, String content, List<String> listVersion) throws PushException;
+	void pushWelfareCenter(Long uid, String title, String content,List<String> listIOS,
+			List<String> listAndroid) throws PushException;
 }

--
Gitblit v1.8.0