- 28 Oct, 2020 22 commits
-
-
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
ping.wu committed -
Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into feature-yu.sun-material-20201030
ping.wu committed -
ping.wu committed
-
徐康 committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
徐康 committed -
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
chongfu.liang committed
-
chongfu.liang committed
-
徐康 committed
-
徐康 committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
徐康 committed -
徐康 committed
-
chongfu.liang committed
-
chongfu.liang committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
chongfu.liang committed
-
chongfu.liang committed
-
- 27 Oct, 2020 18 commits
-
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
chongfu.liang committed -
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
chongfu.liang committed -
chongfu.liang committed
-
