Merge remote-tracking branch 'origin/master'

admin

2019-03-06 55017f3ef6df7364853f224a7704cdc4417ca202

 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);

   }



}