ss
新增工具类代码
Merge branch 'master' of https://github.com/lihongxu/hongxu-tools.git

Conflicts:
	pom.xml