merge 冲突

455bd194 · 查志伟 · 4d95f86e · 455bd194
Commit 455bd194 authored May 17, 2022 by 查志伟
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

order-application-service/src/main/java/cn/freemud/service/thirdparty/SvcTransactionClient.java
+1 -1

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/thirdparty/SvcTransactionClient.java
+++ b/order-application-service/src/main/java/cn/freemud/service/thirdparty/SvcTransactionClient.java
 package cn.freemud.service.thirdparty;

-import cn.freemud.annotations.LogIgnoreFeign;
 import cn.freemud.entities.EdenResponse;
 import cn.freemud.entities.dto.pay.svc.ConsumeHistoryCreateRequest;
+import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;