delete bad code
Merge branch 'dev' of https://github.com/qatang/cms into qatang-dev
Merge branch 'qatang-dev'
fix parameters bug
fix
Merge pull request #59 from JSHgithub/master

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

merge
Merge pull request #11 from qatang/dev

Dev