测试合并
测试合并2
删除无用的类
Merge remote-tracking branch 'origin/dev'

Conflicts:
	freeMarker/src/main/java/git/Test2.java