add base dao and base service
can not commit

can not commit
Merge remote-tracking branch 'origin/cl' into cl

Conflicts:
	src/main/java/hhjt/action/SampleAction.java
	src/main/java/hhjt/action/TestAction.java
	src/main/java/hhjt/bean/Accout.java
	src/main/java/hhjt/bean/Order.java
	src/main/java/hhjt/dao/AccoutDao.java
cl

cl
Merge remote-tracking branch 'origin/cl'
Merge branch 'master' of https://github.com/hanchilin/SSH
delete accont and service
add .project

新增eclipse项目文件
#.project
eclipse项目文件
add info action
add info action by cl
pyz version1

add message
add account dao service
add message dao service
add order dao service
Merge remote-tracking branch 'origin/master' into cl

Conflicts:
	.gitignore
	.project
pyz version2

add test
modify project
delete some actions
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
修改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