pom.xml
4.81 KB
-
Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 5b1f2b6f# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
刘鹏飞 committed