Merge branches 'feature/20200103_支付宝支付下单_wuping' and 'feature/20200117_支付宝下单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20200117_支付宝下单_wuping # Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderResponseVo.java
