解决编译错误
Merge branch 't/svr/env' into refs/top-bases/t/svr/chat
Merge commit 'refs/top-bases/t/svr/chat' into t/svr/chat
Merge branch 't/svr/chat' into refs/top-bases/t/all
Merge branch 't/svr/env' into refs/top-bases/t/svr/friend
Merge commit 'refs/top-bases/t/svr/friend' into t/svr/friend
Merge branch 't/svr/friend' into refs/top-bases/t/all
Merge branch 't/svr/env' into refs/top-bases/t/svr/usf
Merge commit 'refs/top-bases/t/svr/usf' into t/svr/usf
Merge branch 't/svr/usf' into refs/top-bases/t/all
Merge branch 't/svr/env' into refs/top-bases/t/svr/room
Merge commit 'refs/top-bases/t/svr/room' into t/svr/room
Merge branch 't/svr/room' into refs/top-bases/t/all
Merge branch 't/svr/env' into refs/top-bases/t/svr/match
Merge commit 'refs/top-bases/t/svr/match' into t/svr/match
Merge branch 't/svr/match' into refs/top-bases/t/all
Merge branch 't/svr/env' into refs/top-bases/t/svr/payment
Merge branch 't/svr/usf' into refs/top-bases/t/svr/payment
Merge commit 'refs/top-bases/t/svr/payment' into t/svr/payment
Merge branch 't/svr/payment' into refs/top-bases/t/all