Merge pull request #10 from qatang/dev

merge
merge
角色更新
角色更新
merge
Merge pull request #59 from JSHgithub/master

增加userRole中间表，增加findBy(Long userId)方法
角色更新
角色更新
Merge pull request #60 from zzqjava/master

merge
shiro issue
Merge pull request #13 from qatang/dev

Merge pull request #13 from qatang/dev