Conflicts:
	.vs/irisRefactor/v15/.suo
	.vs/irisRefactor/v15/Server/sqlite3/storage.ide
	.vs/irisRefactor/v15/Server/sqlite3/storage.ide-shm
	.vs/irisRefactor/v15/Server/sqlite3/storage.ide-wal
	IrisSetting/obj/Debug/IrisSetting.csproj.CoreCompileInputs.cache
	IrisSetting/obj/Debug/IrisSetting.csproj.GenerateResource.cache
	IrisSetting/obj/Debug/IrisSetting.csprojAssemblyReference.cache
	IrisSetting/obj/Debug/绯荤粺璁剧疆.exe
	IrisSetting/obj/Debug/绯荤粺璁剧疆.pdb
	bin/Debug/AxInterop.MC_DISPLib.dll
	bin/Debug/Interop.MC_DISPLib.dll
	bin/Debug/irisDataBase.dll
	bin/Debug/irisDataBase.pdb
	bin/Debug/irisDoor.dll
	bin/Debug/irisDoor.pdb
	bin/Debug/irisHelper.dll
	bin/Debug/irisHelper.pdb
	bin/Debug/irisIoControll.dll
	bin/Debug/irisIoControll.pdb
	bin/Debug/irisMemory.dll
	bin/Debug/irisMemory.pdb
	bin/Debug/irisPrint.dll
	bin/Debug/irisPrint.pdb
	bin/Debug/irisRefactor.exe
	bin/Debug/irisRefactor.pdb
	bin/Debug/绯荤粺璁剧疆.exe
	bin/Debug/绯荤粺璁剧疆.pdb
	irisDataBase/Service/mysqlImpl/IrisSynchDataServiceImpl.cs
	irisDataBase/obj/Debug/irisDataBase.csproj.CoreCompileInputs.cache
	irisDataBase/obj/Debug/irisDataBase.csprojAssemblyReference.cache
	irisDataBase/obj/Debug/irisDataBase.dll
	irisDataBase/obj/Debug/irisDataBase.pdb
	irisDoor/obj/Debug/irisDoor.csproj.CoreCompileInputs.cache
	irisDoor/obj/Debug/irisDoor.csprojAssemblyReference.cache
	irisDoor/obj/Debug/irisDoor.dll
	irisDoor/obj/Debug/irisDoor.pdb
	irisHelper/obj/Debug/irisHelper.csproj.CoreCompileInputs.cache
	irisHelper/obj/Debug/irisHelper.csproj.FileListAbsolute.txt
	irisHelper/obj/Debug/irisHelper.csprojAssemblyReference.cache
	irisHelper/obj/Debug/irisHelper.dll
	irisHelper/obj/Debug/irisHelper.pdb
	irisIoControll/obj/Debug/irisIoControll.csproj.CoreCompileInputs.cache
	irisIoControll/obj/Debug/irisIoControll.csprojAssemblyReference.cache
	irisIoControll/obj/Debug/irisIoControll.dll
	irisIoControll/obj/Debug/irisIoControll.pdb
	irisMemory/obj/Debug/irisMemory.csproj.CoreCompileInputs.cache
	irisMemory/obj/Debug/irisMemory.csprojAssemblyReference.cache
	irisMemory/obj/Debug/irisMemory.dll
	irisMemory/obj/Debug/irisMemory.pdb
	irisPrint/obj/Debug/irisPrint.csproj.CoreCompileInputs.cache
	irisPrint/obj/Debug/irisPrint.csproj.FileListAbsolute.txt
	irisPrint/obj/Debug/irisPrint.dll
	irisPrint/obj/Debug/irisPrint.pdb
	irisRefactor/obj/x86/Debug/AxInterop.MC_DISPLib.dll
	irisRefactor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	irisRefactor/obj/x86/Debug/Interop.MC_DISPLib.dll
	irisRefactor/obj/x86/Debug/irisRefactor.csproj.CoreCompileInputs.cache
	irisRefactor/obj/x86/Debug/irisRefactor.csproj.GenerateResource.cache
	irisRefactor/obj/x86/Debug/irisRefactor.csproj.ResolveComReference.cache
	irisRefactor/obj/x86/Debug/irisRefactor.csprojAssemblyReference.cache
	irisRefactor/obj/x86/Debug/irisRefactor.exe
	irisRefactor/obj/x86/Debug/irisRefactor.pdb