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

admin

2019-08-19 9c09cead959dbeef292628f345e5f80c30fc3d17

 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;



}