From bc57c01edfe5d96c06999604fab2d91d3d5f3558 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 10 Jun 2026 09:59:43 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-10=20RoHs=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/spring/modules/rohs/entity/RohsEntity.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
index a8236c8e..96390e31 100644
--- a/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
+++ b/src/main/java/com/spring/modules/rohs/entity/RohsEntity.java
@@ -53,8 +53,8 @@ public class RohsEntity implements Serializable {
     /**
      * 计划转量产时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date plannedMassProductionDate;
 
     /**
@@ -115,9 +115,7 @@ public class RohsEntity implements Serializable {
     /**
      * 材料有效期
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date materialValidityTime;
+    private String materialValidityTime;
 
     /**
      * 材料有效期备注
@@ -155,9 +153,11 @@ public class RohsEntity implements Serializable {
     private String buyer;
 
     /**
-     * 预计提供报告时间(个月内)
+     * 预计提供报告时间(一个月内)
      */
-    private Integer expectReportTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date expectReportTime;
 
     /**
      * 所需审批文件