pc Order manage
pc manage
Merge remote-tracking branch 'remote/master'

Conflicts:
	sbgl/src/com/sbgl/app/entity/Computerstatus.java