Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-05 940dd1b292db4c5cc2df2f137fa46c37f2159898

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OrderClient.java

@@ -2,8 +2,6 @@

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ExchangeBackDto;
import com.ruoyi.common.core.dto.ExchangeDto;

import com.ruoyi.other.api.factory.OrderFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;