修复服务器共用数据库后注册数不正常问题
Merge branch 'master' of github.com:334777583/tcht

Conflicts:
	logic/controls/userrole.class.php