From e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
index 23ad364..b7231f5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
@@ -125,7 +125,7 @@
 				// 閮ㄥ垎鎺ㄩ��
 				for (String str_uid: listuid) {
 					if (str_uid != null && str_uid.trim().length() > 0) {
-						pushService.pushUrl(Long.parseLong(str_uid), url, title, content, listIOS, listAndroid);
+						pushService.pushUrl(Long.parseLong(str_uid), title, content, url, listIOS, listAndroid);
 					}
 				}
 			}

--
Gitblit v1.8.0