Merge remote-tracking branch 'origin/guocheng' 修改字符串