merge
Merge branch 'master' of https://github.com/baoshujun/love_pig.git
调整接口