feat: 修复代码冲突

hjl

2024-06-06 c62e9f81b2072473b084abb30f7c005ed341a336

 ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.goods.domain.Recipient;
import com.ruoyi.goods.domain.TGoods;
import com.ruoyi.goods.dto.GoodExchangeDTO;
@@ -44,5 +45,6 @@
     * @param recipient    收货地址
     * @return 兑换结果
     */
    Object goodExchange(GoodExchangeDTO goodExchange, Recipient recipient);
    R goodExchange(GoodExchangeDTO goodExchange, Recipient recipient);
    R goodExchange1(GoodExchangeDTO goodExchange, Recipient recipient);
}