修改字符串工具类
Merge remote-tracking branch 'origin/master'