吴明旺:提交
吴明旺
Merge branch 'master' of ssh://git@github.com/GoIntoSunset/maxlog.git

Conflicts:
	maxlog-parent/src/main/java/com/maxlog/parent/App.java