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 | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
index 3fa0ab2..a9c8c10 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -3,13 +3,19 @@
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")
@@ -24,10 +30,15 @@
@ApiModelProperty("璁惧鍨嬪彿")
private String deviceModel;
- @ApiModelProperty("鎶ヤ慨鏃堕棿")
- private Date repairTime;
-
- private String repairTimeStr;
+ @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;
--
Gitblit v1.9.3