Merge branch 'vopc' of https://github.com/victorgong/ytoo.service
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service
222
zxy
zxy Modi
zxy 0310
zxy 20140312
Signed-off-by: zxy98 <zxy98@126.com>
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc

Conflicts:
	OPCApp/OPCAPP.Common/Properties/AssemblyInfo.cs
	OPCApp/OPCAPP.DataService/Properties/AssemblyInfo.cs
	OPCApp/OPCAPP.Domain/Properties/AssemblyInfo.cs
	OPCApp/OPCApp.AuthManage/OPCApp.AuthManage.csproj
	OPCApp/OPCApp.AuthManage/ViewModels/UserListWindowViewModel.cs
	OPCApp/OPCApp.AuthManage/Views/AuthNavigationItemView.xaml.cs
	OPCApp/OPCApp.BaseInfoManage/IService/IStore.cs
	OPCApp/OPCApp.BaseInfoManage/Models/StoreInfo.cs
	OPCApp/OPCApp.BaseInfoManage/OPCApp.BaseInfoManage.csproj
	OPCApp/OPCApp.BaseInfoManage/ViewModels/OrgManageViewModel.cs
	OPCApp/OPCApp.BaseInfoManage/ViewModels/StoreManageViewModel.cs
	OPCApp/OPCApp.BaseInfoManage/Views/NavigationItemView.xaml.cs
	OPCApp/OPCApp.BaseInfoManage/Views/StoreManage.xaml
	OPCApp/OPCApp.BaseInfoManage/Views/StoreManage4Modify.xaml
	OPCApp/OPCApp.Main.Infrastructure/Mvvm/ViewModel/ViewModel4Grid.cs
	OPCApp/OPCApp.Main.Infrastructure/Properties/Resources.Designer.cs
	OPCApp/OPCApp.Main.Infrastructure/Properties/Settings.Designer.cs
	OPCApp/OPCApp.Order/Views/OrderGoodsInfoView.xaml
	OPCApp/OPCApp.Order/Views/OrderInfoSearch.xaml
	OPCApp/OPCApp.Order/Views/OrderSearch.xaml
	OPCApp/OPCApp.TransManage/IService/IInvoice.cs
	OPCApp/OPCApp.TransManage/IService/IPrint.cs
	OPCApp/OPCApp.TransManage/Models/Invoice.cs
	OPCApp/OPCApp.TransManage/OPCApp.TransManage.csproj
	OPCApp/OPCApp.TransManage/Properties/AssemblyInfo.cs
	OPCApp/OPCApp.TransManage/Properties/Resources.Designer.cs
	OPCApp/OPCApp.TransManage/Properties/Settings.Designer.cs
	OPCApp/OPCApp.TransManage/TransManageModule.cs
	OPCApp/OPCApp.TransManage/ViewModels/NavigationItemViewModel.cs
	OPCApp/OPCApp.TransManage/ViewModels/PrintInvoiceViewModel.cs
	OPCApp/OPCApp.TransManage/ViewModels/StoreInViewModel.cs
	OPCApp/OPCApp.TransManage/ViewModels/StoreOutViewModel.cs
	OPCApp/OPCApp.TransManage/Views/NavigationItemView.xaml
	OPCApp/OPCApp.TransManage/Views/PrintInvoice.xaml
	OPCApp/OPCApp.TransManage/Views/PrintInvoice.xaml.cs
	OPCApp/OPCApp.TransManage/Views/StoreIn.xaml
	OPCApp/OPCApp.TransManage/Views/StoreIn.xaml.cs
	OPCApp/OPCApp.TransManage/Views/StoreOut.xaml
	OPCApp/OPCApp.TransManage/Views/StoreOut.xaml.cs