Merge pull request #5 from qatang/dev

merge
角色更新
角色更新
Merge pull request #6 from qatang/dev

merge
Merge branch 'master' of https://github.com/zzqjava/cms
Merge pull request #3 from qatang/dev

Dev
Merge pull request #43 from JSHgithub/master

a new pull request
角色更新
菜单管理功能修改
菜单表
merge
Merge branch 'master' of https://github.com/zzqjava/cms into zzqjava-master
Merge branch 'zzqjava-master' into dev
Merge pull request #45 from likunpeng06/master

菜单管理修改
fix bug
Merge pull request #8 from qatang/dev

merge dev