From 330f90fe25f054ddcdec4c3ce037ea1ea851be72 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 15 十月 2026 11:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java b/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java
index ef47471..f10213c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/pojo/Device.java
@@ -46,6 +46,7 @@
private LocalDateTime acquisitionDate;
@Schema(description = "鏍″噯鏈夋晥鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime activationDate;
@Schema(description = "绠＄悊浜篒d")
@@ -64,11 +65,35 @@
private String calibrationServices;
@Schema(description = "鏈�杩戞牎鍑嗘棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime lastCalibrationDate;
@Schema(description = "涓嬫鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime nextCalibrationDate;
+ @Schema(description = "鏈�杩戜繚鍏绘棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime lastMaintenanceDate;
+
+ @Schema(description = "涓嬫淇濆吇鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime nextMaintenanceDate;
+
+ @Schema(description = "淇濆吇鍛ㄦ湡(鏈�)")
+ private String maintenanceCycle;
+
+ @Schema(description = "鏈�杩戞牳鏌ユ棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime lastExamineDate;
+
+ @Schema(description = "涓嬫鏍告煡鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime nextExamineDate;
+
+ @Schema(description = "鏍告煡鍛ㄦ湡(鏈�)")
+ private String examineCycle;
+
@Schema(description = "璁惧绫诲瀷")
private String largeCategory;
--
Gitblit v1.9.3