From f4495e2587c0ba7c2085d3db0cbaca0d3fa30489 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期五, 10 十一月 2023 15:27:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java b/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java index f823752..997f410 100644 --- a/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java +++ b/ard-work/src/main/java/com/ruoyi/device/radar/domain/ArdEquipRadar.java @@ -2,6 +2,7 @@ import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -84,6 +85,7 @@ */ @Excel(name = "濉攊d") private String towerId; + @TableField(exist = false) private String towerName; /** -- Gitblit v1.9.3