pom.xml
18.5 KB
-
Merge branches 'feature/20211125_退款回掉取消订单_wuping' and 'qa' of… · 68aedae4
Merge branches 'feature/20211125_退款回掉取消订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
ping.wu committed