Merge remote-tracking branch 'origin/master'

aijinhui

2023-12-14 af3b68eeca07a30967754dc1a61b8def9efe188c

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

@@ -2,6 +2,7 @@

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.alarm.global.domain.GuidePTZ;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -85,6 +86,8 @@
     */
    private String radarId;

    /** 引导PTZ值 */
    private GuidePTZ guidePTZ;


}