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

admin

2019-12-17 2ff5b9cca256aa37fc06e5fec218a056462a6465

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java

@@ -634,10 +634,6 @@
         return;

      Date date = new Date();

      for (TokenRecord tokenRecord: list) {

         Integer state = tokenRecord.getState();

         if (state != null && state == 0) 
            continue;

			
         tokenRecord.setState(1);

         tokenRecord.setUpdateTime(date);

         tokenRecordMapper.updateByPrimaryKeySelective(tokenRecord);