Merge remote-tracking branch 'origin/master'

Administrator

2018-11-20 559e188de93bb05d6c37ec1a0d392ec69ed02567

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

@@ -20,7 +20,7 @@
    * @param deviceToken

    * @param device

    */

   public void addDeviceToken(Long uid, String deviceToken, String device);

   public void addDeviceToken(Long uid,int version, String deviceToken, String device);



   /**

    * 更新设备的deviceToken