宿舍
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
	ZYNLPJPT.suo
kj
finish
Merge https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
	ZYNLPJPT.csproj.orig
1
2
3
4
6
Merge branch 'master' of https://github.com/dinghaoDH/ZYNLPJPT into dinghaoDH-master

Conflicts:
	ZYNLPJPT.csproj
	ZYNLPJPT.csproj.orig
	ZYNLPJPT.suo
	processAspx/ctrData.aspx
Merge branch 'dinghaoDH-master'
fix the bug