Manager
sales
commodity+sort

修改sortVO+commodityVO
Merge branch 'master' of https://github.com/JinXinNJU/JXCSystem

Conflicts:
	JXCSystemClient/src/main/java/ui/UIController.java
Merge branch 'master' of https://github.com/JinXinNJU/JXCSystem

Conflicts:
	JXCSystemClient/src/main/java/vo/CommodityVO.java
	JXCSystemClient/src/main/java/vo/SortVO.java
Merge branch 'master' of https://github.com/JinXinNJU/JXCSystem

Conflicts:
	JXCSystemClient/src/main/java/vo/SortVO.java
Merge branch 'master' of https://github.com/JinXinNJU/JXCSystem

Conflicts:
	JXCSystemClient/src/main/java/ui/manager/SetProPanel.java
Commodity  over
Merge branch 'master' of https://github.com/JinXinNJU/JXCSystem

Conflicts:
	JXCSystemClient/src/main/java/ui/UIController.java
	JXCSystemClient/src/main/java/ui/sales/impanel/ImInPanel.java
	JXCSystemClient/src/main/java/ui/setting/MyTextField.java
	JXCSystemClient/src/main/java/ui/setting/MyTextFieldBorder.java