-
# Conflicts: # dal/src/main/java/com/yohoufo/dal/order/DepositOrderMapper.java # dal/src/main/java/com/yohoufo/dal/order/model/DepositOrder.java # dal/src/main/resources/META-INF/mybatis/order/DepositOrderMapper.xml # order/src/main/java/com/yohoufo/order/service/impl/DepositOrderPaymentService.java # order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
-
# Conflicts: # dal/src/main/java/com/yohoufo/dal/order/StorageDepositMapper.java # order/src/main/java/com/yohoufo/order/service/DepositService.java
-
Conflicts: order/src/main/java/com/yohoufo/order/service/deposit/DepositOrderService.java
-
# Conflicts: # dal/src/main/java/com/yohoufo/dal/product/StorageDepositMapper.java # dal/src/main/resources/META-INF/mybatis/order/StorageDepositMapper.xml
