# Conflicts: # order/src/main/java/com/yohoufo/order/controller/PaymentController.java
remove useless code
