From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/BasePushService.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 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 f6caa0b..aa5c72f 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
@@ -28,17 +28,6 @@
 	void pushUrl(Long uid, String url, String title, String content) throws PushException;
 
 	/**
-	 * 鎺ㄩ�乄EEX鐨勯〉闈紙鏆傛椂涓嶅仛锛�
-	 * 
-	 * @param uid
-	 * @param weexUrl
-	 * @param title
-	 * @param content
-	 * @throws PushException
-	 */
-	void pushWEEXUrl(Long uid, String weexUrl, String title, String content) throws PushException;
-
-	/**
 	 * 鎺ㄩ�佺珯鍐呬俊
 	 * 
 	 * @param uId
@@ -47,4 +36,27 @@
 	 * @throws PushException
 	 */
 	void pushZNX(Long uId, AccountMessage msg,SystemZnx systemZNX) throws PushException;
+	
+	/**
+	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚�
+	 * 鎺ㄩ�亀eex椤甸潰
+	 * @param uid
+	 * @param title
+	 * @param content
+	 * @param weexUrl
+	 * @throws PushException
+	 */
+	void pushWEEX(Long uid, String title, String content, String weexUrl) throws PushException;
+	
+	
+	/**
+	 * 閫傜敤鐗堟湰 1.4.8鍙婁互鍚�
+	 * 鎺ㄩ�佺櫨宸濈綉椤�
+	 * @param uid
+	 * @param title
+	 * @param content
+	 * @param url
+	 * @throws PushException
+	 */
+	void pushBaiChuanUrl(Long uid, String title, String content, String url) throws PushException;
 }

--
Gitblit v1.8.0