From 260ad701e251aaa71a1bf5531bd98d93cb91c2bf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 十一月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
index 079c6e0..57cba52 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWorkDetail.java
@@ -6,6 +6,7 @@
 import com.example.erp.entity.sd.Order;
 import com.example.erp.entity.sd.OrderDetail;
 import com.example.erp.entity.sd.OrderGlassDetail;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -67,8 +68,10 @@
     //杩斿伐瀹℃牳浜�
     private String reviewer;
     //杩斿伐鏃堕棿
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate reworkTime;
     //杩斿伐鏇存柊鏃堕棿
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate reworkUpdateTime;
     //杩斿伐闈㈢Н
    // private double reworkArea;

--
Gitblit v1.8.0