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

admin

2019-08-21 a481da100d823bdebc63ddd11ba23da2f84c38ca

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

@@ -32,6 +32,6 @@
    * @param uid

    * @throws TokenRecordException

    */

   public void receiveToken(String token, Long uid) throws TokenRecordException;

   public String receiveToken(String token, Long uid) throws TokenRecordException;



}