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

Conflicts:
	smile/src/main/java/com/flyhz/shop/service/ShoppingCartService.java
	smile/src/main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
Merge branch 'master' of https://github.com/rememberlostcode/flyhz
	modified:   main/java/com/flyhz/shop/dto/Product.java