add navigation
更新模块加载方式
test
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/BaseInfo/StoreInfo.cs
	OPCApp/OPCAPP.Domain/BaseInfo/shoppeInfo.cs
	OPCApp/OPCAPP.Domain/Properties/AssemblyInfo.cs
	OPCApp/OPCApp.AuthManage/ViewModels/UserListWindowViewModel.cs
	OPCApp/OPCApp.BaseInfoManage/IService/IStore.cs
	OPCApp/OPCApp.BaseInfoManage/Models/StoreInfo.cs
	OPCApp/OPCApp.BaseInfoManage/ViewModels/OrgManageViewModel.cs
	OPCApp/OPCApp.BaseInfoManage/ViewModels/StoreManageViewModel.cs
	OPCApp/OPCApp.BaseInfoManage/Views/StoreManage.xaml
	OPCApp/OPCApp.Main.Infrastructure/Auth/User.cs
	OPCApp/OPCApp.Main.Infrastructure/Auth/UserAuth.cs
	OPCApp/OPCApp.Main.Infrastructure/Mvvm/ViewModel/ViewModel4Grid.cs
	OPCApp/OPCApp.Main.Infrastructure/PageResult.cs
	OPCApp/OPCApp.Main.Infrastructure/Properties/Resources.Designer.cs
	OPCApp/OPCApp.Main.Infrastructure/Properties/Settings.Designer.cs