-
Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · 18e81bcaConflicts: assortment-ordercenter-sdk/pom.xml order-application-service/pom.xml ordercenter-sdk/pom.xml shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.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 shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
zhiheng.zhang committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| main | Loading commit data... | |
| test/java/cn.freemud | Loading commit data... |