new file:   res/drawable-hdpi/add_btn.png
	new file:   res/drawable-hdpi/confirm_btn.png
	new file:   res/drawable-hdpi/sub_btn.png
	new file:   res/drawable/text_view_bg.xml
	modified:   res/layout/order_inform_view.xml
	modified:   res/layout/order_item.xml
	modified:   res/values/strings.xml
	modified:   res/values/url.xml
	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/activity/OrderInformActivity.java
	modified:   src/com/holding/smile/adapter/MyOrderInformAdapter.java
	modified:   src/com/holding/smile/dto/ProductDto.java
	modified:   src/com/holding/smile/dto/RtnValueDto.java
	new file:   src/com/holding/smile/protocol/PProduct.java
	modified:   src/com/holding/smile/service/DataService.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/res/values/url.xml

	modified:   ../smile/src/main/java/com/flyhz/framework/lang/file/FileRepositoryImpl.java
	modified:   ../smile/src/main/java/com/flyhz/framework/util/Constants.java
	modified:   ../smile/src/main/java/com/flyhz/shop/build/solr/SolrTimer.java
	modified:   ../smile/src/main/java/com/flyhz/shop/dto/ProductDto.java
	deleted:    ../smile/src/main/java/com/flyhz/shop/dto/RProductDto.java
	deleted:    ../smile/src/main/java/com/flyhz/shop/dto/Result.java
	modified:   ../smile/src/main/java/com/flyhz/shop/persistence/RedisRepositoryImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/persistence/dao/OrderDao.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/impl/BuildServiceImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/impl/IdcardServiceImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   ../smile/src/main/java/com/flyhz/shop/web/controller/BuildController.java
	modified:   ../smile/src/main/resources/mybatis/sqlmap/ProductMapper.xml
	modified:   res/values/url.xml
	modified:   src/com/holding/smile/activity/BaseActivity.java
	modified:   src/com/holding/smile/activity/IdcardEditActivity.java
	modified:   src/com/holding/smile/service/DataService.java
	modified:   src/com/holding/smile/tools/FileUtils.java