test

sss
clean

清空
test

test bean
增加ticketservice

新增ticketservice和部分action
add ticketservice
修改ticketservice
Merge branch 'master' into cw

Conflicts:
	pom.xml
	src/main/java/hhjt/action/SampleAction.java
	src/main/java/hhjt/bean/Account.java
	src/main/java/hhjt/bean/Accout.java
	src/main/java/hhjt/bean/Info.java
	src/main/java/hhjt/bean/Order.java
	src/main/java/hhjt/bean/Ticket.java
	src/main/java/hhjt/dao/AccoutDao.java
合并主分支
Add TicketService
修改service
Merge branch 'master' of https://github.com/hanchilin/SSH

Conflicts:
	src/main/java/hhjt/bean/Account.java
	src/main/java/hhjt/bean/Info.java
	src/main/java/hhjt/bean/Order.java
	src/main/java/hhjt/bean/Ticket.java
	src/main/resources/applicationContext.xml
	src/test/resources/applicationContext.xml
junit+servlet
修改ticketDao
update