pom.xml
6.81 KB
-
Merge branches 'feature/20210615_PrometheusSchedulerCustom_lb' and 'qa' of… · e76c561a
Merge branches 'feature/20210615_PrometheusSchedulerCustom_lb' 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/OrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
ping.wu committed