Merge branch 'dev' into 'dev'

修复了用户登录过程中传递参数的错误

See merge request !3
Merge branch 'dev' of github.com:MrSummit/cxlab into dev
Merge branch 'dev' of github.com:filow/cxlab into dev
实现用户-角色关联
实现用户与角色关联
修复了一个admin控制器修改角色逻辑的错误
实现用户与角色关联功能
Merge pull request #3 from MrSummit/dev

重新实现用户角色关联