FIX BUG
Merge remote-tracking branch 'origin/master'

Conflicts:
	com.topsun.posclient.sales.ui/src/com/topsun/posclient/sales/ui/table/SalesTableLableProvider.java
断头
Merge remote-tracking branch 'origin/master'
模拟类