-
Merge branches 'develop' and 'feature/20220622_退款失败记录到订单_wuping' of… · c4f76a21
Merge branches 'develop' and 'feature/20220622_退款失败记录到订单_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
ping.wu committed