modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/UserController.java
	modified:   main/resources/mybatis/sqlmap/OrderMapper.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   main/java/com/flyhz/shop/service/OrderService.java
	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   main/java/com/flyhz/shop/service/OrderService.java
	modified:   main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java