Merge pull request #1 from qatang/master

test
Merge pull request #2 from qatang/dev

Dev
Merge pull request #5 from qatang/dev

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

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

merge
完善用户的增删改查
Merge branch 'master' of https://github.com/zzqjava/cms
简单完成分页
Merge pull request #41 from chirowong/master

merge
Revert "merge"
Merge pull request #42 from qatang/revert-41-master

Revert "merge"
Merge pull request #7 from qatang/dev

merge dev
建立c_user表索引
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