Merge branch 'master' into div

yujian

2019-07-11 21f2f635fefa3dcfd38f364c2a9d50c54360899c

 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushService.java

@@ -15,7 +15,7 @@
    * @param listAndroid

    * @throws PushException

    */

   void pushGoods(Long uid, String url, String title, String content, List<String> listIOS,

   void pushGoods(Long uid, String title, String content, String url, List<String> listIOS,

         List<String> listAndroid) throws PushException;



   /**

@@ -28,7 +28,7 @@
    * @param listAndroid

    * @throws PushException

    */

   void pushUrl(Long uid, String url, String title, String content,List<String> listIOS,

   void pushUrl(Long uid, String title, String content, String url, List<String> listIOS,

         List<String> listAndroid) throws PushException;



   /**