From f94b708045d88e0de12d323d535eaea6a508eb18 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期二, 25 二月 2025 09:56:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo
---
zhitan-system/src/main/resources/mapper/peakvalley/ElectricityPriceDateMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/peakvalley/ElectricityPriceDateMapper.xml b/zhitan-system/src/main/resources/mapper/peakvalley/ElectricityPriceDateMapper.xml
index 9e56581..2672b6b 100644
--- a/zhitan-system/src/main/resources/mapper/peakvalley/ElectricityPriceDateMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/peakvalley/ElectricityPriceDateMapper.xml
@@ -80,4 +80,10 @@
#{id}
</foreach>
</delete>
+
+ <select id="selectElectricityPriceDatePageTacticsAll" resultMap="ElectricityPriceDateResult">
+ <include refid="selectElectricityPriceDateVo"/>
+ WHERE begin_date < CURRENT_TIMESTAMP
+ AND end_date > CURRENT_TIMESTAMP
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3