修改user 页面
提交database
Merge branch 'master' of https://github.com/zzlmilk/yajie_weixin_crm

Conflicts:
	weixin_crm/config/database.php
	weixin_crm/publicController/userController.php
修正冲突提交

Signed-off-by: ShiinaMinatus <xij1111@gmail.com>