修改数据不能提交的bug
Merge branch 'master' of https://github.com/hzxia2002/kms

Conflicts:
	web/pages/collectInit.jsp