From ac135b66a5ab9f2f74c55961066974e815b88e9a Mon Sep 17 00:00:00 2001 From: yaowanxin <3588231647@qq.com> Date: 星期四, 04 九月 2025 16:08:43 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx --- src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java index e303be9..87c4e0d 100644 --- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java +++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/ElectricityConsumptionAreaService.java @@ -3,8 +3,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.basic.dto.ProductTreeDto; +import com.ruoyi.equipmentenergyconsumption.dto.ElectricityConsumptionAreaTreeDto; import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea; + +import java.util.List; public interface ElectricityConsumptionAreaService extends IService<ElectricityConsumptionArea> { IPage<ElectricityConsumptionArea> listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea); + + List<ElectricityConsumptionAreaTreeDto> selectElectricityConsumptionAreaList(); } -- Gitblit v1.9.3