add ajax test ok
Merge branch 'master' of https://github.com/haluomao/ClassificationInfoDemo

Conflicts:
	src/main/java/com/student/registration/dao/ClassListMapper.java
	src/main/java/com/student/registration/mapper/ClassListMapper.xml
	src/main/java/com/student/registration/model/ClassList.java
	src/main/java/com/student/registration/model/ClassListExample.java
	src/main/java/com/student/registration/service/impl/ClassListServiceImpl.java
	src/test/java/ServiceTest/ClassListTest.java
V 0.9 还缺少”改“
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/student/registration/controller/AccountController.java
	src/main/java/com/student/registration/controller/ClassificationController.java
	src/main/java/com/student/registration/controller/UserController.java
	src/main/java/com/student/registration/service/ClassListService.java
	src/main/java/com/student/registration/service/impl/ClassListServiceImpl.java
	src/main/java/com/student/registration/vo/ClassListFormBean.java
	src/main/webapp/WEB-INF/pages/css/style.css
	src/main/webapp/WEB-INF/pages/images/background.png
	src/main/webapp/WEB-INF/pages/index.jsp
	src/main/webapp/WEB-INF/pages/login.jsp
	src/test/java/ControllerTest/AccountControllerTest.java
	src/test/java/ServiceTest/ClassListTest.java
V 0.9 还缺少”改“