asdf
asdf
Merge branch 'master' of https://github.com/blackcop/WebServiceDemo.git

Conflicts:
	src/main/java/org/example/ws/pojo/CommercialDetail.java
	src/main/java/org/example/ws/pojo/PictureSetDetail.java
Merge branch 'master' of https://github.com/blackcop/WebServiceDemo.git