addyhgn
Merge pull request #17 from AoteChou/master

f&m&a
Merge pull request #18 from AoteChou/master

ddd
upload
Merge branch 'dinghaoDH-master'

Conflicts:
	ZYNLPJPT.suo
fix the bug
fix the bug in pzZsdyToEjzb.aspx
fix the bug
haojie
Merge branch 'master' of https://github.com/JessenPan/ZYNLPJPT
fff
fix the bug in index.aspx
Merge pull request #20 from zhaohaojie-git/master

haojie
add bin
Merge pull request #21 from zhaohaojie-git/master

add bin
修改权重值范围
m
Merge https://github.com/JessenPan/ZYNLPJPT

Conflicts:
	ZYNLPJPT.suo
add export function and fix bugs