From beb0fc04f59f4f448e70d8de9ae39161632de2fb Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期四, 03 七月 2025 11:22:28 +0800 Subject: [PATCH] 2025-07-01 添加设备维修保养的设备名称合型号字段 --- src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java index 431188d..f5d5463 100644 --- a/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java +++ b/src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java @@ -20,16 +20,25 @@ private Long id; @ApiModelProperty("璁惧鍙拌处id") - private String deviceLedgerId; + private Long deviceLedgerId; + + + private String deviceName; + + private String deviceModel; @ApiModelProperty("璁″垝淇濆吇鏃ユ湡") - private Date maintenancePlanTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime maintenancePlanTime; @ApiModelProperty("瀹為檯淇濆吇浜�") private String maintenanceActuallyName; @ApiModelProperty("瀹為檯淇濆吇鏃ユ湡") - private Date maintenanceActuallyTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime maintenanceActuallyTime; @ApiModelProperty("淇濆吇缁撴灉 0 缁翠慨 1 瀹屽ソ") private Integer maintenanceResult; -- Gitblit v1.9.3