Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java

@@ -181,7 +181,7 @@


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

   }