debug
join_team功能调试完成
Merge branch 'dev' into ricky
Update
Merge branch 'ricky' into dev