sujiali 在公司测试
5.22
5.22彭浩然新建分支
Merge branch 'master' of https://github.com/SueGary/GraduationDesign

Conflicts:
	PEIS_SPZZ/PEIS_SPZZ/bin/Debug/PEIS_SPZZ.exe
	PEIS_SPZZ/PEIS_SPZZ/bin/Debug/PEIS_SPZZ.pdb
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/GenerateResource.read.1.tlog
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/GenerateResource.write.1.tlog
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/PEIS_SPZZ.csproj.FileListAbsolute.txt
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/PEIS_SPZZ.exe
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/PEIS_SPZZ.pdb
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/ResolveAssemblyReference.cache
5.25
三层架构各部分编写说明
5.27
5.27
......
5.27
Merge branch 'master' of https://github.com/SueGary/GraduationDesign

Conflicts:
	PEIS(鏍锋澘,鍙綔涓哄涔犵敤閫?/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PEIS_SPZZ/PEIS_SPZZ.suo
	PEIS_SPZZ/PEIS_SPZZ/DAL/Common/TJ_YHB_DAL.cs
	PEIS_SPZZ/PEIS_SPZZ/DAL/SqlServer/BJJY_DAL.cs
	PEIS_SPZZ/PEIS_SPZZ/DAL/SqlServer/GRBJ_DAL.cs
	PEIS_SPZZ/PEIS_SPZZ/DAL/SqlServer/RYDJB_DAL.cs
	PEIS_SPZZ/PEIS_SPZZ/DAL/SqlServer/YYKS_DAL.cs
	PEIS_SPZZ/PEIS_SPZZ/bin/Debug/PEIS_SPZZ.exe
	PEIS_SPZZ/PEIS_SPZZ/bin/Debug/PEIS_SPZZ.pdb
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/GenerateResource.read.1.tlog
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/GenerateResource.write.1.tlog
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/PEIS_SPZZ.exe
	PEIS_SPZZ/PEIS_SPZZ/obj/x86/Debug/ResolveAssemblyReference.cache
5.28彭浩然更新TJ_YHB对应DAL/Common/TJ_YHB_DAL.cs,DAL/SqlServer/TJ_YHB_DAL.cs
5.28彭浩然更新TJ_YHB之DAL(COMMON,SQLSERVER)
5.28
5.28彭浩然修改
5.28PHR更新DAL之TJ_YHB.CS
sjl