-
Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · e3b3d62fConflicts: shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
zhiheng.zhang committed