merge 冲突

order-management/src/main/java/cn/freemud/management/thirdparty/FMAssistantApplicationClient.java

 package cn.freemud.management.thirdparty;
 
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.management.annotations.LogIgnoreFeign;
 import cn.freemud.management.constant.ResponseCodeConstant;
 import cn.freemud.management.constant.ResponseCodeKeyConstant;
 import cn.freemud.management.thirdparty.request.OrderSellCouponRefundRequest;
-import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
+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.RequestBody;
@@ -21,6 +20,6 @@ public interface FMAssistantApplicationClient {
      * 非码侧拒绝接单|取消订单  抖音核销券业务取消订单操作
      */
     @PostMapping("/assistant/thirdparty/order/refund")
-    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printLog = true)
+    @LogIgnoreFeign(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR}, messageFieldName = ResponseCodeKeyConstant.MSG, printInfoLog = true)
     BaseResponse orderRefund(@RequestBody OrderSellCouponRefundRequest request);
 }