readme.md
2.6 KB
-
Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into develop · 147438fd
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
haibo.jiang committed