Merge branch 'master' into div

yujian

2019-07-02 572a8ec9a3adac7488395ae86bf875f3175f8d46

 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);



}