merge
merge
Merge branch 'master' of github.com:edizon/GzService

Conflicts:
	GZService.v11.suo
merge
merge
Merge branch 'master' of github.com:edizon/GzService

Conflicts:
	Bussiness/obj/Debug/Bussiness.csproj.FileListAbsolute.txt
	Bussiness/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Bussiness/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
	GZService.v11.suo
	Model/obj/Debug/Model.csproj.FileListAbsolute.txt
	RestServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RestServer/obj/Debug/RestServer.csproj.FileListAbsolute.txt
	RestServer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
merge
Merge branch 'master' of github.com:edizon/GzService

Conflicts:
	GZService.v11.suo
	RestServer/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
MERGE
Merge branch 'master' of github.com:edizon/GzService

Conflicts:
	Bussiness/App/MakeuperService.cs
	DataORM/DataORM.csproj
	GZService.v11.suo
	RestServer/obj/Release/RestServer.csproj.FileListAbsolute.txt
add check interface