Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-02-08 60d57d3ef0c01653fe50b782186d52b79e655ff6

 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>