修复好了sales，把customervo的shouldpay加上去了
Merge branch 'master' of https://github.com/JinXinNJU/JXCSystem

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