diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java index f2867af..3a92f93 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java @@ -36,33 +36,39 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable /** * 维修记录ID */ - @ExcelProperty(value = "维修记录ID") + // @ExcelProperty(value = "维修记录ID") private Long recordId; /** * 设备ID */ - @ExcelProperty(value = "设备ID") + // @ExcelProperty(value = "设备ID") private String deviceId; + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String deviceName; + /** * 维修时间 */ @ExcelProperty(value = "维修时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ColumnWidth(20) - private Date repairTime; + private String repairTime; /** - * 维修部位 + * 损坏部位 */ - @ExcelProperty(value = "维修部位") + @ExcelProperty(value = "损坏部位") private String repairPart; /** - * 维修原因 + * 损坏原因 */ - @ExcelProperty(value = "维修原因") + @ExcelProperty(value = "损坏原因") private String repairReason; /** @@ -70,11 +76,7 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable */ @ExcelProperty(value = "维修人员") private String repairPerson; - /** - * 维修人员 - */ - @ExcelProperty(value = "设备名称") - private String deviceName; + private List images;