# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java

Merge remote-tracking branch 'origin/feature-20210426/xxl-job上报订单微信数据-周晓航' into feature-20210426/xxl-job上报订单微信数据-周晓航

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

Merge remote-tracking branch 'origin/feature/20210420-华莱士公用分支-张志恒' into feature/20210420-华莱士公用分支-张志恒

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java