- 22 Sep, 2020 5 commits
-
-
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop Conflicts: .gitignore assortment-ordercenter-sdk/readme.md 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 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/enums/ResponseResult.java order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java ordercenter-sdk/readme.md shopping-cart-application-service/pom.xml shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
xiaoer.li@freemud.com committed -
vega committed
-
vega committed
-
vega committed
-
vega committed
-
- 21 Sep, 2020 12 commits
-
-
zhiheng.zhang committed
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
徐康 committed
-
徐康 committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
- 20 Sep, 2020 1 commit
-
-
zhiheng.zhang committed
-
- 19 Sep, 2020 2 commits
-
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
- 18 Sep, 2020 11 commits
-
-
# Conflicts: # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
徐康 committed -
zhiheng.zhang committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
zhiheng.zhang committed
-
徐康 committed
-
徐康 committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
# Conflicts: # 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/vo/CreateOrderVo.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
vega committed
-
- 17 Sep, 2020 9 commits
-
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
徐康 committed
-
徐康 committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
徐康 committed -
徐康 committed
-
zhiheng.zhang committed
-
Merge branches 'develop' and 'feature/20200915_购物车添加限制数量_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
ping.wu committed -
ping.wu committed
-
