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

admin

2020-03-01 c5f54810f60e036317562b1b42cfeafd18e984c5

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

@@ -28,6 +28,14 @@
   public void unBindUid(Long uid, Long deviceActiveId);



   /**

    * 绑定设备

    * 
    * @param uid

    * @param deviceActiveId

    */

   public void bindUid(Long uid, Long deviceActiveId);



   /**

    * 计算所有的设备

    * 

    * @return