字符串截取
fix conflict
Merge branch 'master' of https://github.com/likunpeng/study