From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java b/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java
index 0bc7f03..8e68de7 100644
--- a/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java
+++ b/cnas-resource-require/src/main/java/com/yuanchu/mom/dto/FeIlluminationDto.java
@@ -1,8 +1,10 @@
package com.yuanchu.mom.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.pojo.FeIllumination;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -21,8 +23,12 @@
private String managementNumber;
@ApiModelProperty("鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date calibrationDate;
@ApiModelProperty("涓嬫鏍″噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date nextCalibrationDate;
}
--
Gitblit v1.9.3