Change-Id: I3e185029b3f0c88ef94c659230c41a4a61686f82
Merge branch 'master' of
https://github.com/EricleeCrystal/huoshi-core.git

Conflicts:
	pom.xml

Change-Id: I6d84417c2aa92d95c9e0e912744981072129cbeb