aaa
fix the bug
hahah~~
Merge branch 'master' of https://github.com/zhaohaojie-git/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
	ZYNLPJPT.csproj.orig
	ZYNLPJPT.suo
add function of xgxk.aspx
add function of xgzy.aspx
tempa commit
add function xgbj.aspx
fix the bug in xgbj.aspx
fix the bug in ZYNPJPT.csproj
fix the bug of missing some html <>
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT
Merge pull request #8 from dinghaoDH/master

add new function
fix the bug in javascript file
...
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.csproj
	ZYNLPJPT.suo
QQQ
Merge pull request #9 from zhaohaojie-git/master

QQQ
sss
Merge pull request #10 from zhaohaojie-git/master

sss