解决冲突
Merge branch 'SpringSecurity+springMVC' of
https://github.com/mhjian/GitTest.git into SpringSecurity+springMVC