Merge pull request #13 from JSHgithub/master

a new pull request for chirowong merge JSHgithub
优化
Merge branch 'master' of github.com:chirowong/cms
fix userRoleInput.jsp
merge zzq
fix UserController.java
Merge branch 'master' of https://github.com/chirowong/cms into chirowong-master
Merge branch 'chirowong-master'