-
Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' · 3dc90aa6
# Conflicts: # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
vega committed