readme.md
2.62 KB
-
Merge branch 'feature/1.9.21-mockpaysuccess-20190422dingkai' into develop · 005e93c2
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # order-management/pom.xml
dingkai committed