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

admin

2019-08-29 b99a10cff6b4c4d0965871be894fba8ba64605fc

 fanli/src/main/java/com/yeshi/fanli/mapping/user/TokenRecordMapper.xml

@@ -74,4 +74,10 @@
   LIMIT 1
  </select>
  
  <select id="overdueList" resultMap="BaseResultMap">
     SELECT * FROM yeshi_ec_token_record
   WHERE tr_state = 0 AND tr_end_time IS NOT NULL AND tr_end_time <![CDATA[<]]> NOW()
   LIMIT #{count}
  </select>
  
</mapper>