Merge pull request #11 from qatang/dev

merge dev
Merge pull request #9 from qatang/dev

merge
fix part of bugs
角色更新
角色更新
Merge remote-tracking branch 'origin/master'
fix
删除不必要的代码
merge
角色更新
Merge pull request #58 from JSHgithub/master

修改userController
Merge pull request #57 from zzqjava/master

更新角色
Merge pull request #56 from likunpeng06/master

菜单管理7.30
Merge pull request #8 from qatang/dev

Dev