-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/seller/SellerAdvanceOrderComputeHandler.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/handler/SellerOrderComputeHandler.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/seller/AbsSellerOrderComputeHandler.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/seller/AbsSellerOrderComputeHandler.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/utils/OrderAssist.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/seller/ImportPublishExcutor.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/proxy/ProductProxyService.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/SellerOrderDetailService.java # order/src/main/java/com/yohoufo/order/service/seller/OrderComputeHandler.java # order/src/test/java/com/yohoufo/order/service/SellerOrderServiceTest.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/model/request/PrdQueryReq.java