Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-14 0306d5836a7a56614e01af35b9e70f0224b47cb2

 ard-work/src/main/java/com/ruoyi/alarm/radar/domain/RadarAlarmData.java

@@ -26,5 +26,6 @@
    @Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date alarmTime;
    private List<ArdAlarmRadar> ardAlarmRadars;

    /**雷达跟踪引导数据*/
    private List<ArdAlarmRadar>  ardFollowRadars;
}