From 5aeec2b48b5c3f1ed9d9ecf8b95a8ddc2031d43d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 三月 2019 14:15:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
index 146da1d..9cf9fcd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
@@ -181,8 +181,14 @@
@Override
public void pushBaiChuanUrl(Long uid, String title, String content, String url) throws PushException {
-// iosPushService.pushBaiChuanUrl(uid, title, content, url);
+ iosPushService.pushBaiChuanUrl(uid, title, content, url);
xmPushService.pushBaiChuanUrl(uid, title, content, url);
}
+ @Override
+ public void pushWelfareCenter(Long uid, String title, String content) throws PushException {
+ iosPushService.pushWelfareCenter(uid, title, content);
+ xmPushService.pushWelfareCenter(uid, title, content);
+ }
+
}
--
Gitblit v1.8.0