-
Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' · ac05693d# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java # shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
xiaoer.li@freemud.com committed