-
Merge branches 'feature/20210827_储值卡新规则赠送内容校验_wuping' and 'qa' of… · cd1f619aMerge branches 'feature/20210827_储值卡新规则赠送内容校验_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.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/ShoppingCartMallServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
ping.wu committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| src/main/java/cn/freemud/management | Loading commit data... | |
| pom.xml | Loading commit data... |