Merge remote-tracking branch 'origin/master'

lin

2024-04-10 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af

 src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml

@@ -99,6 +99,7 @@
            </if>
           and jpar.is_deleted = 0
        </where>
        order by jpar.id desc,jpar.create_time desc
    </select>

    <resultMap type="org.springblade.modules.police.dto.PoliceAlarmRecordsDTO" id="PoliceAlarmRecordsDTOResult">