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

Conflicts:
	Intime.OPC/Intime.OPC.Repository/ISaleRepository.cs
	Intime.OPC/Intime.OPC.Repository/Support/SaleRepository.cs
	Intime.OPC/Intime.OPC.Repository/Support/TransRepository.cs
	Intime.OPC/Intime.OPC.Service/ISaleService.cs
	Intime.OPC/Intime.OPC.Service/Support/SaleService.cs
	Intime.OPC/Intime.OPC.WebApi/Core/MessageHandlers/AccessToken/UserIdFilterAttribute.cs
	OPCApp/OPCAPP.DataService/Impl/Auth/MenuDataService.cs
	OPCApp/OPCApp.TransManage/OPCApp.TransManage.csproj
从 liu 拷贝 提交 解决同步问题
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	Intime.OPC/Intime.OPC.Common/Extensions/CollectionExtensions.cs
	Intime.OPC/Intime.OPC.Common/Extensions/StringExtensions.cs
	Intime.OPC/Intime.OPC.Common/Properties/AssemblyInfo.cs
	Intime.OPC/Intime.OPC.sln.GhostDoc.xml
	OPCApp/OPCApp.BaseInfoManage/OPCApp.BaseInfoManage.csproj
	OPCApp/OPCApp.BaseInfoManage/Views/StoreAddWindow.xaml