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

Conflicts:
	Intime.OPC/Intime.OPC.Domain/Dto/ShippingSaleDto.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/SaleController.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/TransController.cs
	Intime.OPC/Intime.OPC.WebApi/Core/BaseController.cs
	OPCApp/OPCAPP.DataService/Impl/Trans/TransService.cs
	OPCApp/OPCAPP.Domain/Enums/EnumSearchSaleStatus.cs
	OPCApp/OPCApp.TransManage/ViewModels/SaleOrderPickupViewModel.cs
1
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPCApp/OPCApp.TransManage/ViewModels/CustomerInquiriesViewModel.cs
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPCApp/OPCAPP.DataService/Impl/Info/CommonInfo.cs
	OPCApp/OPCApp.TransManage/ViewModels/CustomerInquiriesViewModel.cs
	OPCApp/OPCApp.TransManage/ViewModels/StoreOutViewModel.cs
1