pom.xml
17.6 KB
-
Merge branch 'feature/20210707_hekuoOrderAutoComplete_miaohui' into qa · 8009d3b4# Conflicts: # order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java
缪晖 committed
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java