小提交

Signed-off-by: mahaitao <354650951@qq.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
完成12个，还有4个未完成

Signed-off-by: mahaitao <354650951@qq.com>