修改函数名
Merge branch 'master' of https://github.com/maobaoqi/VS2013.git