新增DaoImple
修改dao
update
Merge branch 'cl'

Conflicts:
	src/main/resources/struts.xml
新增购票页面
commit by cl
ss
Merge branch 'master' into cw

Conflicts:
	src/main/java/hhjt/dao/TicketDao.java
	src/main/java/hhjt/dao/impl/TicketDaoImpl.java
	src/main/java/hhjt/entity/QueryClass.java
	src/main/resources/struts.xml
	src/main/webapp/registersuc.jsp
add edit_account
edit some files
modify something
新增买票页面
add
Merge branch 'cw'
Merge branch 'master' of https://github.com/hanchilin/SSH
edit something
Merge branch 'master' of https://github.com/hanchilin/SSH.git

Conflicts:
	src/main/webapp/login.jsp
	src/main/webapp/loginsuc.jsp
test