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

Conflicts:
	Intime.OPC/Intime.OPC.Repository/IOrderRepository.cs
	Intime.OPC/Intime.OPC.Repository/Support/OrderRepository.cs
	Intime.OPC/Intime.OPC.Service/IOrderService.cs
	Intime.OPC/Intime.OPC.Service/ISaleRMAService.cs
	Intime.OPC/Intime.OPC.Service/Support/OrderService.cs
	Intime.OPC/Intime.OPC.Service/Support/SaleRMAService.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/CustomController.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/OrderController.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/RMAController.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/TransController.cs
	OPCApp/OPCApp.Order/ViewModels/CustomerInquiriesViewModel.cs
	OPCApp/OPCApp.Order/ViewModels/CustomerReturnGoodsViewModel.cs
	OPCApp/OPCApp.Order/ViewModels/CustomerSelfNetRuturnGoods.cs
	OPCApp/OPCApp.Order/Views/CustomerReturnSearchCommon.xaml
	OPCApp/OPCApp.Order/Views/CustomerSelfNetRuturnGoods.xaml
	OPCApp/OPCApp.ReturnGoodsManage/Views/ReturnAcceptCashierView.xaml
	OPCApp/OPCApp.ReturnGoodsManage/Views/ReturnPackagePrintExpressageView.xaml