From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 17 三月 2025 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/DeviceMetricRecord.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DeviceMetricRecord.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DeviceMetricRecord.java
index 5dffcf7..66e7930 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DeviceMetricRecord.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DeviceMetricRecord.java
@@ -38,9 +38,11 @@
private String unitOfMeasure;
@ApiModelProperty("鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date calibrationDate;
@ApiModelProperty("涓嬫鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date nextCalibrationDate;
@ApiModelProperty("璁＄畻鍣ㄥ叿")
@@ -85,5 +87,6 @@
private String type;
@ApiModelProperty("纭鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date confirmDate;
}
--
Gitblit v1.9.3