From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 015a340..c108b04 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
@@ -15,7 +15,7 @@
 	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushGoods(Long uid, String url, String title, String content, List<String> listIOS,
+	void pushGoods(Long uid, String title, String content, String url, List<String> listIOS,
 			List<String> listAndroid) throws PushException;
 
 	/**
@@ -28,7 +28,7 @@
 	 * @param listAndroid
 	 * @throws PushException
 	 */
-	void pushUrl(Long uid, String url, String title, String content,List<String> listIOS,
+	void pushUrl(Long uid, String title, String content, String url, List<String> listIOS,
 			List<String> listAndroid) throws PushException;
 
 	/**

--
Gitblit v1.8.0