xx-order/xx-order-api · dd1685ae3c4c6e4a2f1dc6f1ce36ebe57d8c9991 · youjj / cloud-platform

Merge remote-tracking branch 'origin/master-background-manager' into master-background-manager · dea0daff

jiaorz authored Oct 31, 2019

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRefundController.java

dea0daff

Name	Last commit	Last update
..
src/main/java/com/xxfc/platform/order		Loading commit data...
pom.xml		Loading commit data...