From 0496a6f7e58b6ee0f0e5f565e6d65a9be3852dc1 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Wed, 20 Mar 2024 11:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=8A=A5?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/TerminalBasicInfoHistory.java      | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalBasicInfoHistory.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalBasicInfoHistory.java
index c210b85..2c23493 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalBasicInfoHistory.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalBasicInfoHistory.java
@@ -11,17 +11,18 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigInteger;
+import java.util.Date;
 
 @Data
 @ApiModel(value = "设备基本信息的历史", description = "设备基本信息的历史")
 public class TerminalBasicInfoHistory implements Serializable {
+    @ExcelIgnore
+    private Integer termId;
 
     @ColumnWidth(20)
     @ExcelProperty("设备编号")
     @ApiModelProperty(value = "图像监测装置 ID", example = "123456")
     private String cmdid;
-    @ExcelIgnore
-    private Integer termId;
 
     @ColumnWidth(20)
     @ExcelProperty("版本号")
@@ -44,6 +45,31 @@ public class TerminalBasicInfoHistory implements Serializable {
         return date.toString();
     }
 
+    @ColumnWidth(20)
+    @ExcelProperty("装置名称")
+    @ApiModelProperty(value = "装置名称", example = "123456")
+    private String equipName;
+
+    @ColumnWidth(20)
+    @ExcelProperty("型号")
+    @ApiModelProperty(value = "型号", example = "123456")
+    private String model;
+
+    @ColumnWidth(20)
+    @ExcelProperty("通信协议版本号")
+    @ApiModelProperty(value = "通信协议版本号", example = "123456")
+    private String protocolVersion;
+
+    @ColumnWidth(20)
+    @ExcelProperty("生产厂家")
+    @ApiModelProperty(value = "生产厂家", example = "123456")
+    private String bsManu;
+
+    @ColumnWidth(20)
+    @ExcelProperty("生产日期")
+    @ApiModelProperty(value = "生产日期", example = "123456")
+    private Date productionDate;
+
     private static final long serialVersionUID = 1L;
 
 }
\ No newline at end of file