modified:   src/main/java/com/flyhz/shop/service/impl/ProductServiceImpl.java
	modified:   res/values/strings.xml
	modified:   res/values/url.xml
	modified:   src/com/holding/smile/activity/WebViewActivity.java
	modified:   src/com/holding/smile/service/DataService.java
Merge branch 'master' of http://github.com/rememberlostcode/flyhz
	modified:   src/com/holding/smile/activity/WebViewActivity.java
	new file:   src/com/holding/smile/dto/OrderPayDto.java
	modified:   src/com/holding/smile/dto/RtnValueDto.java
	new file:   src/com/holding/smile/protocol/PPayStatus.java
	modified:   src/com/holding/smile/service/DataService.java