- 04 Sep, 2020 1 commit
-
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-management/pom.xml # order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java # order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java
徐康 committed
-
- 27 Oct, 2020 11 commits
-
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java
chongfu.liang committed -
chongfu.liang committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
xiaoer.li@freemud.com committed
-
徐康 committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
刘鹏飞 committed -
徐康 committed
-
chongfu.liang committed
-
刘鹏飞 committed
-
- 26 Oct, 2020 10 commits
-
-
徐康 committed
-
刘鹏飞 committed
-
刘鹏飞 committed
-
xiaoer.li@freemud.com committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
刘鹏飞 committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
- 23 Oct, 2020 11 commits
-
-
ping.wu committed
-
Merge branches 'develop' and 'feature-yu.sun-material-20201030' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
huiyang.chen committed
-
huiyang.chen committed
-
ping.wu committed
-
Merge branches 'develop' and 'feature-yu.sun-material-20201030' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
huiyang.chen committed
-
徐康 committed
-
- 22 Oct, 2020 7 commits
-
-
ping.wu committed
-
Merge branches 'develop' and 'feature-yu.sun-material-20201030' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java # shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
徐康 committed
-
徐康 committed
-
huiyang.chen committed
-
