modified:   ../../smile/src/main/java/com/flyhz/shop/persistence/TaobaoDataImpl.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/persistence/entity/IdcardModel.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/service/IdcardService.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/service/OrderService.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/IdcardController.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/web/controller/TaobaoController.java
	modified:   ../../smile/src/main/resources/exception.properties
	modified:   ../../smile/src/main/resources/mybatis/sqlmap/IdcardMapper.xml
	new file:   drawable-hdpi/zwtp.jpg
	modified:   layout/idcard_edit.xml
	modified:   ../src/com/holding/smile/activity/BaseActivity.java
	modified:   ../src/com/holding/smile/activity/IdcardEditActivity.java
	modified:   ../src/com/holding/smile/entity/Idcard.java
	modified:   ../src/com/holding/smile/service/SubmitService.java
	modified:   ../src/com/holding/smile/tools/CodeValidator.java
	modified:   ../src/com/holding/smile/tools/FileUtils.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz