Merge pull request #4 from qatang/dev

7.17merge
Merge pull request #5 from qatang/dev

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

merge
menuController
角色更新
角色更新
Merge remote-tracking branch 'origin/master'
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 branch 'dev' of https://github.com/qatang/cms into qatang-dev
Merge branch 'qatang-dev'