测试
Delete
Z
Signed-off-by: dongamp1990 <dongamp1990@gmail.com>
Signed-off-by: dongamp1990 <dongamp1990@gmail.com>
Signed-off-by: dongamp1990 <dongamp1990@gmail.com>
Merge branch 'local'

Conflicts:
	src/config/springConfig/applicationContext_dao.xml
Merge branch 'b' of https://github.com/dongamp1990/BasePJ.git
Merge branch 'master' of https://github.com/dongamp1990/BasePJ

Conflicts:
	WebContent/WEB-INF/jsp/server/left.jsp
Signed-off-by: dongamp1990 <dongamp1990@gmail.com>
Merge branch 'master' of https://github.com/dongamp1990/BasePJ into local

Conflicts:
	.classpath
	WebContent/WEB-INF/jsp/server/left.jsp
	src/config/springConfig/applicationContext_bean.xml
	src/config/springConfig/applicationContext_dao.xml
Signed-off-by: dongamp1990 <dongamp1990@gmail.com>
Merge branch 'local'

Conflicts:
	.classpath
	WebContent/WEB-INF/jsp/server/left.jsp
	src/com/men/basepj/common/Constants.java
	src/config/springConfig/applicationContext_dao.xml

Signed-off-by: dongamp1990 <dongamp1990@gmail.com>
Signed-off-by: dongamp1990 <dongamp1990@gmail.com>
Merge branch 'master' of https://github.com/dongamp1990/BasePJ

Conflicts:
	src/config/struts/struts-server.xml

Signed-off-by: dongamp1990 <dongamp1990@gmail.com>