Merge remote-tracking branch 'origin/master'
删除demo.java,修改pom.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
确定controller到view结构