部分逻辑
部分逻辑
Merge branch 'master' of https://github.com/WRKMNO4/System_Server

Conflicts:
	src/RMI/Communication_Controller.java
呵呵
Merge branch 'master' of https://github.com/WRKMNO4/System_Server

Conflicts:
	src/RMI/Communication_Controller.java