修改test.java
Merge remote-tracking branch 'origin/master'
删除demo.java,修改pom.xml