-
Merge branch 'master' into develop · 6dd43341# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java # order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java # order-management/pom.xml # ordercenter-sdk/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
huiyang.chen committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| src/main/java/cn/freemud/management | Loading commit data... | |
| pom.xml | Loading commit data... |