Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-05 e42d5134188b4e93ebb0580ef60034976c987f0f

 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml

@@ -46,6 +46,7 @@
                AND alarm_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
        </where>
        order by alarm_time desc
    </select>
    
    <select id="selectArdAlarmRadarPumpById" parameterType="String" resultMap="ArdAlarmRadarPumpResult">