Signed-off-by: Lao Zhuang <346255540@qq.com>
Signed-off-by: Lao Zhuang <346255540@qq.com>
Merge github.com:laozhuang/OfficeOnlineSystem

Signed-off-by: Lao Zhuang <346255540@qq.com>
Merge github.com:laozhuang/OfficeOnlineSystem
Signed-off-by: Lao Zhuang <346255540@qq.com>
Signed-off-by: Lao Zhuang <346255540@qq.com>
Signed-off-by: Lao Zhuang <346255540@qq.com>
Merge github.com:laozhuang/OfficeOnlineSystem
Signed-off-by: Lao Zhuang <346255540@qq.com>
Signed-off-by: Lao Zhuang <346255540@qq.com>
Merge https://github.com/laozhuang/OfficeOnlineSystem

Conflicts:
	OfficeOnlineSystem/BLL/BLL.csproj
	OfficeOnlineSystem/BLL/FileBL.cs
	OfficeOnlineSystem/BLL/bin/Debug/BLL.dll
	OfficeOnlineSystem/BLL/bin/Debug/BLL.pdb
	OfficeOnlineSystem/BLL/bin/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/BLL/bin/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/BLL/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/BLL/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
	OfficeOnlineSystem/BLL/obj/Debug/BLL.dll
	OfficeOnlineSystem/BLL/obj/Debug/BLL.pdb
	OfficeOnlineSystem/BLL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/BLL/obj/Debug/ResolveAssemblyReference.cache
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/ResolveAssemblyReference.cache
	OfficeOnlineSystem/DataTransfer/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/DataTransfer/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/DataTransfer/obj/Debug/DataTransfer.dll
	OfficeOnlineSystem/DataTransfer/obj/Debug/DataTransfer.pdb
	OfficeOnlineSystem/DataTransfer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/OfficeOnlineSystem.sln
	OfficeOnlineSystem/OfficeOnlineSystem.suo
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer_Accessor.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer_Accessor.pdb
	OfficeOnlineSystem/TestProject2/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/TestProject2/bin/Debug/TestProject2.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/TestProject2.pdb
	OfficeOnlineSystem/TestProject2/obj/Debug/DataAccessLayer_Accessor.dll
	OfficeOnlineSystem/TestProject2/obj/Debug/DataAccessLayer_Accessor.pdb
	OfficeOnlineSystem/TestProject2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/TestProject2/obj/Debug/ResolveAssemblyReference.cache
	OfficeOnlineSystem/TestProject2/obj/Debug/TestProject2.dll
	OfficeOnlineSystem/TestProject2/obj/Debug/TestProject2.pdb
	OfficeOnlineSystem/Website/Approval.aspx
	OfficeOnlineSystem/Website/Approval.aspx.cs
	OfficeOnlineSystem/Website/Bin/DataAccessLayer.dll
	OfficeOnlineSystem/Website/Bin/DataAccessLayer.pdb
	OfficeOnlineSystem/Website/Bin/DataTransfer.dll
	OfficeOnlineSystem/Website/Bin/DataTransfer.pdb
	OfficeOnlineSystem/Website/Default.aspx
	OfficeOnlineSystem/Website/Default.aspx.cs
	OfficeOnlineSystem/Website/Draft.aspx
	OfficeOnlineSystem/Website/Draft.aspx.cs
	OfficeOnlineSystem/Website/Register.aspx.cs
	OfficeOnlineSystem/Website/web.config
Merge https://github.com/laozhuang/OfficeOnlineSystem

Conflicts:
	OfficeOnlineSystem/DataAccessLayer/Post_fileQueryHql.cs
	OfficeOnlineSystem/DataAccessLayer/Treat_fileQueryHql.cs
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DataAccessLayer.csproj.FileListAbsolute.txt
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/ResolveAssemblyReference.cache
	OfficeOnlineSystem/DataTransfer/User.cs
	OfficeOnlineSystem/DataTransfer/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/DataTransfer/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/DataTransfer/obj/Debug/DataTransfer.csproj.FileListAbsolute.txt
	OfficeOnlineSystem/DataTransfer/obj/Debug/DataTransfer.dll
	OfficeOnlineSystem/DataTransfer/obj/Debug/DataTransfer.pdb
	OfficeOnlineSystem/DataTransfer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/OfficeOnlineSystem.sln
	OfficeOnlineSystem/OfficeOnlineSystem.suo
	OfficeOnlineSystem/TestProject2/TreatFileQueryHql.cs
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer_Accessor.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer_Accessor.pdb
	OfficeOnlineSystem/TestProject2/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/TestProject2/bin/Debug/TestProject2.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/TestProject2.pdb
	OfficeOnlineSystem/TestProject2/obj/Debug/DataAccessLayer_Accessor.dll
	OfficeOnlineSystem/TestProject2/obj/Debug/DataAccessLayer_Accessor.pdb
	OfficeOnlineSystem/TestProject2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/TestProject2/obj/Debug/OfficeOnlineSystemTest.csproj.FileListAbsolute.txt
	OfficeOnlineSystem/TestProject2/obj/Debug/ResolveAssemblyReference.cache
	OfficeOnlineSystem/TestProject2/obj/Debug/TestProject2.dll
	OfficeOnlineSystem/TestProject2/obj/Debug/TestProject2.pdb
Merge https://github.com/laozhuang/OfficeOnlineSystem

Conflicts:
	OfficeOnlineSystem/BLL/BLL.csproj
	OfficeOnlineSystem/BLL/FileBL.cs
	OfficeOnlineSystem/BLL/bin/Debug/BLL.dll
	OfficeOnlineSystem/BLL/bin/Debug/BLL.pdb
	OfficeOnlineSystem/BLL/bin/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/BLL/bin/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/BLL/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/BLL/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
	OfficeOnlineSystem/BLL/obj/Debug/BLL.dll
	OfficeOnlineSystem/BLL/obj/Debug/BLL.pdb
	OfficeOnlineSystem/BLL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/BLL/obj/Debug/ResolveAssemblyReference.cache
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/DataAccessLayer/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/DataAccessLayer/obj/Debug/ResolveAssemblyReference.cache
	OfficeOnlineSystem/DataTransfer/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/DataTransfer/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/DataTransfer/obj/Debug/DataTransfer.dll
	OfficeOnlineSystem/DataTransfer/obj/Debug/DataTransfer.pdb
	OfficeOnlineSystem/DataTransfer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/OfficeOnlineSystem.sln
	OfficeOnlineSystem/OfficeOnlineSystem.suo
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer.pdb
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer_Accessor.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/DataAccessLayer_Accessor.pdb
	OfficeOnlineSystem/TestProject2/bin/Debug/DataTransfer.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/DataTransfer.pdb
	OfficeOnlineSystem/TestProject2/bin/Debug/TestProject2.dll
	OfficeOnlineSystem/TestProject2/bin/Debug/TestProject2.pdb
	OfficeOnlineSystem/TestProject2/obj/Debug/DataAccessLayer_Accessor.dll
	OfficeOnlineSystem/TestProject2/obj/Debug/DataAccessLayer_Accessor.pdb
	OfficeOnlineSystem/TestProject2/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	OfficeOnlineSystem/TestProject2/obj/Debug/ResolveAssemblyReference.cache
	OfficeOnlineSystem/TestProject2/obj/Debug/TestProject2.dll
	OfficeOnlineSystem/TestProject2/obj/Debug/TestProject2.pdb
	OfficeOnlineSystem/Website/Approval.aspx
	OfficeOnlineSystem/Website/Approval.aspx.cs
	OfficeOnlineSystem/Website/Bin/DataAccessLayer.dll
	OfficeOnlineSystem/Website/Bin/DataAccessLayer.pdb
	OfficeOnlineSystem/Website/Bin/DataTransfer.dll
	OfficeOnlineSystem/Website/Bin/DataTransfer.pdb
	OfficeOnlineSystem/Website/Default.aspx
	OfficeOnlineSystem/Website/Default.aspx.cs
	OfficeOnlineSystem/Website/Draft.aspx
	OfficeOnlineSystem/Website/Draft.aspx.cs
	OfficeOnlineSystem/Website/Register.aspx.cs
	OfficeOnlineSystem/Website/web.config

Signed-off-by: Lao Zhuang <346255540@qq.com>