From c8355d4a1f27716edc510d936b6a7982b0ab99b3 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 24 三月 2025 13:37:26 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after

---
 cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java b/cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java
index fc2b403..efaccdf 100644
--- a/cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java
+++ b/cnas-personnel/src/main/java/com/yuanchu/mom/dto/TrainingRecordPersonDetailedDto.java
@@ -1,7 +1,9 @@
 package com.yuanchu.mom.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -12,6 +14,8 @@
     private String trainingDateString;
 
     @ApiModelProperty("鍩硅鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date trainingDate;
 
     @ApiModelProperty("鍩硅鍐呭")

--
Gitblit v1.9.3