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