前后台整合
Merge branch 'master' of https://github.com/chenxiandiao/ATMS.git

Conflicts:
	ATMS/src/main/webapp/js/atms1.js