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

Conflicts:
	OPCApp/OPCAPP.DataService/Impl/Trans/TransService.cs
	OPCApp/OPCAPP.Domain/Enums/EnumSetRemarkType.cs
	OPCApp/OPCApp.TransManage/ViewModels/PrintInvoiceViewModel.cs
	OPCApp/OPCApp.TransManage/ViewModels/StoreOutViewModel.cs