-
Merge branch 'develop' of… · 11dde846
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