pom.xml
6.6 KB
-
Merge branch 'feature/20210420-华莱士公用分支-张志恒' into develop · dd5f4a72
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-management/pom.xml # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
hanghang.wang committed