同步试试
Merge remote-tracking branch 'origin/master'

Conflicts:
	JXCSystemClient/src/main/java/data/salesdata/SaleDataService_Stub.java