bug修复

bug修复
ewe

rwr2wr
56

ge
Merge branch 'master' of https://github.com/chenshipeng/AiJia

Conflicts:
	AiJia/MainVC/loginVC/LoginRegisterViewController.m