# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java