# Conflicts: # order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java # shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
