pom.xml
16.3 KB
-
Merge branch 'feature/1.9.36-新增银联礼品卡支付-肖家炜' into develop · 89c79879# Conflicts: # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
vega committed
# Conflicts: # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java