Merge remote-tracking branch 'origin/jtwy' into jtwy

zss

2026-01-20 0629abbc318d5f78d2e91b45e4526d35a4ed8115

 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);
}