Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

ali

2025-02-25 f94b708045d88e0de12d323d535eaea6a508eb18

 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 &lt; CURRENT_TIMESTAMP
        AND end_date &gt; CURRENT_TIMESTAMP
    </select>
</mapper>