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

admin

2019-11-20 e33752e9f600e6e0cdb9c0119b5ea286be33162c

 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