增加上传的调试
同步工作空间
Merge branch 'dev' of https://github.com/pengqin/ecgplatform.git into
dev

Conflicts:
	web/src/main/webapp/index.html
	web/src/main/webapp/login.html
	web/src/main/webapp/uindex.html
	web/src/main/webapp/ulogin.html