-
Conflicts: order/src/main/java/com/yohoufo/order/service/deposit/DepositOrderService.java
-
Conflicts: order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/AppraiseService.java
-
This reverts commit 00f99cca.