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

Conflicts:
	OPCApp/OPCApp.AuthManage/Views/Role2MenuWindow.xaml
	OPCApp/OPCApp.TransManage/ViewModels/CustomerInquiriesViewModel.cs
	OPCApp/OPCApp.TransManage/ViewModels/PrintInvoiceViewModel.cs
add store,brand,shipvia
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service.git
1
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc