除了草稿其他都完
Merge branch 'master' of https://github.com/JinXinNJU/JXCSystem

Conflicts:
	JXCSystemClient/src/main/java/ui/ManagerPanel.java