# Conflicts: # call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreClient.java # pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/aop/WebAspect.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CalculationClient.java # shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerApplicationClient.java # shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/StockClient.java
