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

yujian

2020-04-23 2bd2200f209ddb7bcc59b636d9de6f8b3f762958

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/TokenRecordService.java

@@ -26,7 +26,7 @@
    * @return

    * @throws TokenRecordException

    */

   public TokenVO discernToken(String token, Long uid, AcceptData acceptData) throws TokenRecordException;

   public TokenVO discernToken(String token, Long uid, String platform,String version) throws TokenRecordException;



   

   /**