Merge remote-tracking branch 'origin/master' into div

yujian

2019-06-24 cb6f69f1207ab6cc9c6006515cb831833cfe0d36

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

@@ -47,4 +47,12 @@
    */

   void unBindDeviceToken(String device);



   /**

    * 将用户ID绑定到设备上

    * 
    * @param device

    * @param uid

    */

   void bindUid(String device, Long uid);



}