Signed-off-by: liyanlong <295697141@qq.com>
Merge branch 'master' of git@github.com:Wenhaohao/hyd.git

Conflicts:
	Application/Home/Controller/UserController.class.php