小问题修复
Merge branch 'zhoujiebin' into s4
s4 测试