冲突测试
Merge remote-tracking branch 'origin/master'

Conflicts:
	shopImooc/lib/string.func.php