增加为2.4
第二个新建2.1
增加2.5
Merge remote-tracking branch 'origin/master'

Conflicts:
	project-core/src/main/java/com/cm/project/core/TestNewClass.java