# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # assortment-shoppingcart-sdk/assortment-shoppingcart-sdk.iml # assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java # order-application-service/src/main/java/cn/freemud/controller/OrderController.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java # order-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
