Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

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



}