-
Merge branch '2020/09/24-运费券-huiyang' into qa · 933dec5f
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
huiyang.chen committed