并发判断
Merge branch 'develop' of https://github.com/momoplan/weixin into develop

Conflicts:
	src/main/java/com/ruyicai/weixin/exception/ErrorCode.java