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

Conflicts:
	OPCApp/OPCApp.TransManage/ViewModels/StoreOutViewModel.cs
	OPCApp/OPCApp.TransManage/Views/StoreOut.xaml