Merge branch 'mater-1.6.0' into div

admin

2019-08-26 1d1c321cdb8905d8c89c26637d36b975c4b12742

 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);



}