Fix bug
Merge branch 'GUO-COMBINE' of https://github.com/StarkDraven/SportJoin
Fix bug
Fix bug