fix 合并冲突

b5e1acf5 · 刘继明 · 2bc6f3f7 · b5e1acf5
Commit b5e1acf5 authored Aug 03, 2021 by 刘继明
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 4 deletions

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1 -4

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
@@ -30,10 +30,7 @@ import cn.freemud.entities.dto.activity.PayGiftCheckAndJoinResponseObj;
 import cn.freemud.entities.dto.activity.PayGitCheckAndJoinRequestDto;
 import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.ecology.SendMessageRequest;
-import cn.freemud.entities.dto.order.CreateOrderOperateDto;
-import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
-import cn.freemud.entities.dto.order.FacePayRequestDto;
-import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.order.*;
 import cn.freemud.entities.dto.pay.*;
 import cn.freemud.entities.dto.product.AttributeValue;
 import cn.freemud.entities.dto.product.GroupDetail;