# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/SendGoods.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/AdditionSharingService.java