modified:   pom.xml
	modified:   src/main/java/com/flyhz/shop/persistence/dao/OrderDao.java
	modified:   src/main/java/com/flyhz/shop/service/OrderService.java
	modified:   src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/web/controller/TaobaoController.java
	modified:   src/main/resources/mybatis/sqlmap/OrderMapper.xml
	modified:   ../smile_android/src/com/holding/smile/activity/LoginActivity.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz