Merge remote-tracking branch 'upstream/master'
1
Merge branch 'master' of github.com:lejingw/shiro-example

git commit -m '1'Merge branch 'master' of github.com:lejingw/shiro-example