Merge pull request #4 from qatang/dev

7.17merge
Merge pull request #5 from qatang/dev

7.17
菜单管理修改
遍历菜单页面
菜单管理7.24
menu
Merge pull request #11 from qatang/dev

merge dev
fix part of bugs
menuController
fix
删除不必要的代码
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 #10 from qatang/dev

merge