modified:   main/java/com/flyhz/shop/service/UserService.java
	modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/UserController.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
	modified:   main/java/com/flyhz/shop/service/impl/UserServiceImpl.java
	modified:   main/java/com/flyhz/shop/web/controller/UserController.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz