增加long3
Merge branch 'master' of https://github.com/lwkjob/myNotes.git

Conflicts:
	pom.xml