modified:   ../../smile/src/main/java/com/flyhz/shop/persistence/TaobaoDataImpl.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/persistence/dao/LogisticsDao.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   ../../smile/src/main/resources/mybatis/sqlmap/LogisticsMapper.xml
	modified:   com/holding/smile/activity/BaseActivity.java
	modified:   com/holding/smile/activity/CategoryActivity.java
	modified:   com/holding/smile/activity/EmailActivity.java
	modified:   com/holding/smile/activity/GoodsDetailActivity.java
	modified:   com/holding/smile/activity/IdcardEditActivity.java
	modified:   com/holding/smile/activity/MyApplication.java
	modified:   com/holding/smile/service/DataService.java
	modified:   com/holding/smile/service/LoginService.java
	new file:   com/holding/smile/tools/CodeValidator.java
	new file:   com/holding/smile/tools/ToastUtils.java
 Changes not staged for commit:
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile/src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java

	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java