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

Conflicts:
	Intime.OPC/Intime.OPC.Repository/ISaleRepository.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/SaleController.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/TransController.cs