-
Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' · b6d5a887# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/SetMealServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
xiaoer.li@freemud.com committed