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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

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

@@ -34,4 +34,7 @@
    */

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



	
   public void updateByPrimaryKeySelective(TokenRecord record);



}