# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java