# Conflicts: # order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java