From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 23 六月 2025 11:11:02 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0 --- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java index 5c0b77d..68ab24a 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerLotteryEventController.java @@ -98,7 +98,7 @@ if (null == lotteryEvent) { return R.fail("抽奖活动不存在"); } - if (!lotteryEvent.getShopId().equals(dto.getShopId())) { + if (!lotteryEvent.getShopId().equals(dto.getShopId().intValue())) { return R.fail("查询失败"); } List<TLotteryEventPrize> list = lotteryEventPrizeService.list(new LambdaQueryWrapper<TLotteryEventPrize>().eq(TLotteryEventPrize::getLotteryEventId, dto.getId())); @@ -139,7 +139,7 @@ if (null == lotteryEvent) { return R.fail("抽奖活动不存在"); } - if (!lotteryEvent.getShopId().equals(dto.getShopId())) { + if (!lotteryEvent.getShopId().equals(dto.getShopId().intValue())) { return R.fail("查询失败"); } Page<ShopWinningRecordVo> page = new Page<>(); -- Gitblit v1.7.1