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

Conflicts:
	Intime.OPC/Intime.OPC.Domain/Models/YintaiHZhouContext.cs
	Intime.OPC/Intime.OPC.Repository/ISaleRepository.cs
	Intime.OPC/Intime.OPC.Service/ISaleService.cs
	Intime.OPC/Intime.OPC.Service/Support/SaleService.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/SaleController.cs
w
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.Domain/Models/YintaiHZhouContext.cs
	Intime.OPC/Intime.OPC.Repository/ISaleRepository.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/Controllers/MenuController.cs
	Intime.OPC/Intime.OPC.WebApi/Controllers/SaleController.cs
	Intime.OPC/Intime.OPC.WebApi/Core/MessageHandlers/AccessToken/UserIdFilterAttribute.cs
	OPCApp/OPCAPP.DataService/Impl/Auth/AuthenticateService.cs
	OPCApp/OPCAPP.DataService/Impl/Trans/TransService.cs
	OPCApp/OPCAPP.Domain/Enums/EnumSearchSaleStatus.cs
	OPCApp/OPCApp.BaseInfoManage/IService/IStore.cs
	OPCApp/OPCApp.BaseInfoManage/OPCApp.BaseInfoManage.csproj
	OPCApp/OPCApp.BaseInfoManage/ViewModels/StoreManageViewModel.cs
	OPCApp/OPCApp.BaseInfoManage/Views/StoreAddWindow.xaml
	OPCApp/OPCApp.TransManage/ViewModels/PrintInvoiceViewModel.cs
	OPCApp/OPCApp.TransManage/ViewModels/RemarkViewModel.cs
	OPCApp/OPCApp.TransManage/ViewModels/StoreOutViewModel.cs
	OPCApp/OPCApp.TransManage/Views/PrintInvoice.xaml
	OPCApp/OPCApp.TransManage/Views/StoreIn.xaml
	OPCApp/OPCApp.TransManage/Views/StoreOut.xaml
	OPCApp/OPCApp.TransManage/Views/StoreOut.xaml.cs