OrderAdapter.java
153 KB
-
Merge branch 'feature/20200103_支付宝支付下单_wuping' into develop · 5e744f36
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/enums/OrderSourceType.java
shuhu.hou@freemud.cn committed