Merge branches 'feature/20210831_积分商城2期现金支付_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java
