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