用户权限模块的功能完善
Merge remote-tracking branch 'origin/master'