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

Conflicts:
	OPCApp/OPCAPP.DataService/Impl/Auth/AuthenticateService.cs
	OPCApp/OPCAPP.DataService/Impl/Auth/OrgService.cs
	OPCApp/OPCAPP.DataService/Impl/Info/CommonInfo.cs
	OPCApp/OPCApp.AuthManage/ViewModels/UserListWindowViewModel.cs
	OPCApp/OPCApp.AuthManage/Views/OrgAddWindow.xaml
zxy
zxy
zxy
zxy
zxy
zxy
zxy
zxy
zxy
zxy
zxy
Merge branch 'vopc' of https://github.com/victorgong/ytoo.service into vopc
zxy
zxy
zxy
zxy
zxy
ZXY