AccountServiceImpl 部分实现
Merge branch 'master' of https://github.com/blackcop/WebServiceDemo.git
针对新修改的数据库，修改了bean
将application.xml进行了修改
pom修改
将resource文件夹重命名为resources
Merge branch 'master' into develop

Conflicts:
	.settings/org.eclipse.wst.common.component
	src/main/java/org/example/ws/service/CommercialService.java
	src/main/resources/applicationContext.xml
修改
TDJ commit
Merge branch 'develop' of https://github.com/blackcop/WebServiceDemo.git
into develop

Conflicts:
	src/main/java/org/example/ws/bean/Coupon.java
TDJ
Merge branch 'develop' of https://github.com/blackcop/WebServiceDemo.git
into develop

Conflicts:
	src/main/java/org/example/ws/service/impl/CouponServiceImpl.java