解决编译错误
Merge branch 't/svr/env' into refs/top-bases/t/svr/friend
Merge commit 'refs/top-bases/t/svr/friend' into t/svr/friend