From 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 02 三月 2026 17:04:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
index 4eabf91..cf7805f 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
@@ -18,7 +18,6 @@
@Override
public IPage<EnergyPeriod> listPage(Page page, EnergyPeriod energyPeriod) {
- IPage<EnergyPeriod> listPage = energyPeriodMapper.listPage(page, energyPeriod);
- return listPage;
+ return energyPeriodMapper.listPage(page, energyPeriod);
}
}
--
Gitblit v1.9.3