Merge pull request #2 from qatang/master

merge dev
Merge pull request #3 from qatang/dev

pull request
完善用户的增删改查
完善用户的增删改查
Merge pull request #10 from zzqjava/master

更新角色
Merge branch 'master' of https://github.com/JSHgithub/cms into JSHgithub-master

Conflicts:
	src/main/java/com/qatang/cms/constants/CommonConstants.java
Merge branch 'JSHgithub-master' into dev
init
init
Merge pull request #4 from qatang/dev

merge