From b265007b416705588737a34b01fdb5dbd7f58511 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 22 五月 2024 15:38:37 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish --- ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java index 2a8c81e..607532e 100644 --- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java +++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/ITGoodsService.java @@ -5,10 +5,10 @@ import com.ruoyi.goods.domain.Recipient; import com.ruoyi.goods.domain.TGoods; import com.ruoyi.goods.dto.GoodExchangeDTO; +import com.ruoyi.goods.vo.GoodDetailVO; import com.ruoyi.goods.vo.TGoodsVO; import java.util.List; -import java.util.Map; /** * <p> @@ -35,7 +35,7 @@ * @param recipient 默认收货地址 * @return 立即兑换页面数据 */ - Map<String, Object> redeemNow(String goodId, Recipient recipient); + GoodDetailVO redeemNow(String goodId, Recipient recipient); /** * 商品兑换 -- Gitblit v1.7.1