From d5fb7403743cd1b42c805853da68a8366e4b50d2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 17 六月 2024 19:25:50 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
index 3f7c6ef..c897110 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoRm/RmTimingReportHistory.java
@@ -9,6 +9,7 @@
 import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo;
 import com.dy.common.po.BaseEntity;
 import com.dy.common.util.DateTime;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -61,16 +62,19 @@
     /**
     * 鏁版嵁鎺ユ敹鏃ユ湡鏃堕棿
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date dt;
 
     /**
     * 鎺у埗鍣ㄦ椂閽�
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public Date rtuDt;
 
     /**
     * 鏁版嵁鏃堕棿
     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date dataDt;
 
     /**

--
Gitblit v1.8.0