-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/BuyerOrderServiceImpl.java
-
# Conflicts: # dal/src/main/java/com/yohoufo/dal/product/StorageMapper.java
-
This reverts commit 4f6acd0b.
-
# Conflicts: # order/src/main/java/com/yohoufo/order/constants/MetaKey.java
-
# Conflicts: # web/src/main/resources/databases.yml
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/SellerOrderService.java # product/src/main/java/com/yohoufo/product/controller/ProductController.java
