-
Merge branch 'feature/20210527-购物车重构V2-王世昌' into qa · 20fb0abd
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/list/ListCartGoodsBO.java # shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformAddGoodsService.java # shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformApportionService.java # shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformListCartGoodsService.java
王世昌 committed