ui  修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	Summer-Java/src/summer/ui/PeoppleManage.java
	Summer-Java/src/summer/ui/ScanEquipment.java
rename peoplemanager.java