# Conflicts: # order/src/main/java/com/yohoufo/order/service/handler/payment/PayServiceFactory.java
This reverts commit f26db226.
This reverts commit 027aff85.