-
# Conflicts: # product/src/main/java/com/yohoufo/product/service/ProductService.java # product/src/main/java/com/yohoufo/product/service/impl/ProductServiceImpl.java # web/src/main/resources/databases.yml # web/src/main/webapp/META-INF/autoconf/databases.yml
-
This reverts commit 35201050.
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/support/codegenerator/populater/AtomicIdPopulator.java
