Merge branch 'dev1'

Administrator

2018-11-30 d66e9c7c859f255b0e81e01a57707c5b9a34d7ff

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

@@ -33,7 +33,7 @@
    * @param device

    * @return

    */

   public DeviceTokenIOS getDeviceTokenByDevice(String device);

   public DeviceTokenIOS getDeviceTokenByDeviceToken(String deviceToken);



   /**

    * 根据用户ID获取DeviceToken