- 08 Sep, 2020 10 commits
- 07 Sep, 2020 16 commits
-
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
vega committed
-
Merge branches 'feature-2020/9/6-fabu-huiyang' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature-2020/9/6-fabu-huiyang
ping.wu committed -
ping.wu committed
-
ping.wu committed
-
Merge branches 'feature-2020/9/6-fabu-huiyang' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature-2020/9/6-fabu-huiyang # Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java # shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
ping.wu committed -
huiyang.chen committed
-
huiyang.chen committed
-
徐康 committed
-
- 06 Sep, 2020 13 commits
-
-
ping.wu committed
-
徐康 committed
-
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/OrderApplication.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java # order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java
徐康 committed -
ping.wu committed
-
徐康 committed
-
huiyang.chen committed
-
huiyang.chen committed
-
徐康 committed
-
huiyang.chen committed
-
徐康 committed
-
ping.wu committed
-
# Conflicts: # assortment-ordercenter-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-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java # ordercenter-sdk/pom.xml
huiyang.chen committed -
ping.wu committed
-
- 05 Sep, 2020 1 commit
-
-
ping.wu committed
-
