pom.xml
7.16 KB
-
Merge branch 'feature/20210103-停车场订单添加排序规则-张志恒' into develop · 471f2bb0
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java # call-back-service/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-management/pom.xml # ordercenter-sdk/pom.xml
zhiheng.zhang committed