错误提示修正版1
Merge branch 'wxc'