new master

更新master
cl test

test
Merge remote-tracking branch 'origin/pyz'
ssh-1.1.1

含有project文件
test action
add entity bean
Merge branch 'master' of https://github.com/hanchilin/SSH
Revert "ssh-1.1.1"

This reverts commit 31b07c65ee5fb6e930a3bdb4cbeb0c82fdc3ad2c.
add entity

add bean
Merge remote-tracking branch 'origin/cl'
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