-
Merge branch 'feature/20211021_加价购支持虚拟商品' into qa · 28cc8495# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.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/calculate/promotion/AdditionSharingService.java
周晓航 committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| main/java/com/freemud/sdk/api/assortment/order | Loading commit data... | |
| test | Loading commit data... |