-
This reverts commit cce52a64.
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/controller/ShoppingController.java # order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java # web/src/main/resources/config.properties