-
Merge remote-tracking branch 'origin/qa' into qa · e05be944# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-shoppingcart-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java # order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java # order-management/pom.xml # shopping-cart-application-service/pom.xml # 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
zhiheng.zhang committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| client | Loading commit data... | |
| controller | Loading commit data... | |
| manager | Loading commit data... | |
| pwd | Loading commit data... | |
| service | Loading commit data... | |
| utils | Loading commit data... | |
| AllTests.java | Loading commit data... |