加了个空格
加入gitignore
添加登录验证 将action变为了do Merge https://github.com/hackcode93/DLNU_MIS

Conflicts:
	.gitignore
一次新的合并提交 login被林志抄改了

Conflicts:
	WebRoot/login.html
	WebRoot/statics/js/main.js
	WebRoot/statics/js/stu_Add.js
更改login页面 stu_Add.js
Merge https://github.com/hackcode93/DLNU_MIS

Conflicts:
	WebRoot/login.html
加
删除多余的extjs，加入三级联动
删除extjs多余，三级联动

Conflicts:
	WebRoot/WEB-INF/classes/com/xeon/mis/action/AjaxAreaAction.class
	WebRoot/WEB-INF/classes/com/xeon/mis/action/QueryAction.class
	WebRoot/WEB-INF/classes/com/xeon/mis/action/UploadAction.class
	WebRoot/WEB-INF/classes/com/xeon/mis/filter/UserLoginFilter.class
	WebRoot/WEB-INF/classes/com/xeon/mis/utils/ExcelUtils.class
	WebRoot/WEB-INF/classes/com/xeon/mis/utils/HibernateUtils.class
	WebRoot/WEB-INF/classes/com/xeon/mis/utils/JsonUtils.class
	WebRoot/WEB-INF/classes/hibernate.cfg.xml
	WebRoot/WEB-INF/classes/struts.xml
	WebRoot/ajax.html
	WebRoot/statics/css/login.css
	WebRoot/statics/js/Science.js
	WebRoot/statics/js/economicsTrade.js
	WebRoot/statics/js/stu_Add.js
	WebRoot/statics/js/stu_Query.js
	src/com/xeon/mis/action/DisplayAction.java
	src/hibernate.cfg.xml
	src/struts.xml
a