From 03df670a1dfbcae8031e84e15dff0b77365f0af6 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 14 八月 2025 16:39:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim_zss --- src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/ElectricityConsumptionAreaMapper.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/ElectricityConsumptionAreaMapper.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/ElectricityConsumptionAreaMapper.java index d9bd3c6..337ae70 100644 --- a/src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/ElectricityConsumptionAreaMapper.java +++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/mapper/ElectricityConsumptionAreaMapper.java @@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface ElectricityConsumptionAreaMapper extends BaseMapper<ElectricityConsumptionArea> { - IPage<ElectricityConsumptionArea> listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea); + IPage<ElectricityConsumptionArea> listPage(Page page, @Param("electricityConsumptionArea") ElectricityConsumptionArea electricityConsumptionArea); } -- Gitblit v1.9.3