zxy
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc
zxy
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPCApp/OPCApp.TransManage/Views/StoreOut.xaml
zxy
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPCApp/OPCApp.Order/Views/CustomerInquiries.xaml
	OPCApp/OPCApp.Order/Views/CustomerStockoutRemindCommon.xaml
	OPCApp/OPCApp.TransManage/ViewModels/PrintInvoiceViewModel.cs
	OPCApp/OPCApp.TransManage/Views/SaleOrderPickupView.xaml
	OPCApp/OPCApp.TransManage/Views/StoreIn.xaml
zxy