Merge branch 'master' into div1

yujian

2018-12-29 2dff570ccfa532f8c012bc13829b302dd3e1b9d3

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

@@ -176,6 +176,7 @@
   @Override

   public void pushBaiChuanUrl(Long uid, String title, String content, String url) throws PushException {

      iosPushService.pushBaiChuanUrl(uid, title, content, url);

      xmPushService.pushBaiChuanUrl(uid, title, content, url);

   }



}