-
This reverts commit 7321c103.
-
This reverts commit 138f5a3d.
-
# Conflicts: # web/src/main/resources/databases.yml # web/src/main/webapp/META-INF/autoconf/databases.yml
-
This reverts commit 8a2055c1.
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/processor/SellerOrderPrepareProcessor.java
