JUNIT测试
Merge branch 'master' of https://github.com/WRKMNO4/System_Server

Conflicts:
	bin/.gitignore