Merge branch 'develop1.0' into zt_from_develop1.0

zt916916

2025-03-20 622e2b900a43fb6658e4d46cd376cd99e9633ab1

 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>