-
Merge branch 'feature-2020/8/6-McCafe-会阳' into feature-2020/9/6-fabu-huiyang · af70e3d8# 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