From a6673284d4ec0b7c11079c65d940c9443d86d11e Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期三, 06 三月 2019 15:21:48 +0800 Subject: [PATCH] 冲突 --- fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 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 b936603..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 @@ -185,4 +185,10 @@ 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