-
Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into qa · 9961dd73
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
张洪旺 committed