修改 接口检查错误，改正后不会修改的bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json