-
# Conflicts: # dal/src/main/java/com/yoho/order/model/StorageDeposit.java # order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
-
Conflicts: dal/src/main/java/com/yoho/order/model/StorageDeposit.java dal/src/main/resources/META-INF/mybatis/StorageDepositMapper.xml order/src/main/java/com/yoho/ufo/order/service/IStorageDepositService.java order/src/main/java/com/yoho/ufo/order/service/impl/StorageDepositServiceImpl.java
-
# Conflicts: # order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
-
# Conflicts: # order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
