Merge remote-tracking branch 'origin/master'

admin

2019-01-24 f617136cba7f851a32f6091d5adc3e80f0e224c2

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

   }