解决一些兼容问题
Merge branch 'master' of https://github.com/rabbitgo/work

Conflicts:
	script/userOperate.js