pom.xml
17.2 KB
-
Merge remote-tracking branch 'remotes/origin/feature/20210203-springcloud升级版本-张志恒' · b9494359# Conflicts: # order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponClient.java
zhiheng.zhang committed
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponClient.java