From 8e941a8eac3329725cdd59cfa2bf3482ccbf057a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 8df1411..a9c8c10 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -3,20 +3,26 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import java.util.Date;
@Data
+@AllArgsConstructor
+@NoArgsConstructor
public class DeviceRepairDto {
@ApiModelProperty("璁惧鎶ヤ慨id")
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
@ApiModelProperty("璁惧鍚嶇О")
private String deviceName;
@@ -24,8 +30,15 @@
@ApiModelProperty("璁惧鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
- private Date repairTime;
+ @ApiModelProperty("鎶ヤ慨鏃堕棿寮�濮�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime repairTimeStart;
+
+ @ApiModelProperty("鎶ヤ慨鏃堕棿缁撴潫")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime repairTimeEnd;
@ApiModelProperty("鎶ヤ慨浜�")
private String repairName;
@@ -33,12 +46,17 @@
@ApiModelProperty("鎶ヤ慨鍐呭")
private String remark;
+ @ApiModelProperty("鎶ヤ慨椤圭洰")
+ private String repairProject;
+
@ApiModelProperty("缁翠慨浜�")
private String maintenanceName;
@ApiModelProperty("缁翠慨鏃堕棿")
private Date maintenanceTime;
+ private String maintenanceTimeStr;
+
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
--
Gitblit v1.9.3