# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java