Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-21 97be33990c1a082e5e55b33b8b88bb7360537d54

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

@@ -53,6 +53,7 @@
                AND alarm_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
        </where>
        order by alarm_time desc
    </select>

    <select id="selectArdAlarmExternalById" parameterType="String" resultMap="ArdAlarmExternalResult">