Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-03-23 a70d0dfe221e06381b6e290d1dab85c9ab4fdc31

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

@@ -3,10 +3,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;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

@@ -107,8 +104,8 @@
     */
    private String radarId;
    /**
     * 引导PTZ值
     * 井号
     */
    private GuidePTZ guidePTZ;
    private String wellId;

}