Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-09 b5ae703a499b97fd83dd9a7b67a10a7b8157df5f

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

@@ -24,10 +24,10 @@
        <include refid="selectArdAlarmApponekeyVo"/>
        <where>
            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                AND alarm_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
                AND create_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
                AND alarm_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
                AND create_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
            </if>
        </where>
        order by create_time desc