test

sss
clean

清空
test

test bean
#.project
增加ticketservice

新增ticketservice和部分action
add info action
add info action by cl
Merge remote-tracking branch 'origin/master' into cl

Conflicts:
	.gitignore
	.project
modify project
add ticketservice
delete some actions
修改ticketservice
Merge remote-tracking branch 'origin/cl'

Conflicts:
	pom.xml
	src/main/java/hhjt/action/TestAction.java
	src/main/java/hhjt/dao/impl/OrderDaoImpl.java
	src/main/java/hhjt/service/AccountService.java
	src/main/java/hhjt/service/impl/AccountServiceImpl.java
	src/main/resources/struts.xml
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
新增DaoImple