fix bug
Merge branch 'master' of https://github.com/antme/jgs

Conflicts:
	zcyservice/src/main/webapp/index.jsp