-
Merge branch 'feature/1.9.22-蜜雪预支付-20200430-dingkai' into qa · 64bfc023# Conflicts: # order-application-service/src/main/java/cn/freemud/service/AppOrderService.java # order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java # order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
dingkai committed