From e7f7daae5d21ad2988cadd25b6987ca5e7ef8001 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 09:51:20 +0800
Subject: [PATCH] 修改bug

---
 cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java
index ddf02ce..e9e930a 100644
--- a/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java
+++ b/cnas-server/src/main/java/com/yuanchu/limslaboratory/pojo/CnasSatisfactionSurvey.java
@@ -9,7 +9,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.sql.Date;
+import java.util.Date;
 import java.time.LocalDateTime;
 
 /**
@@ -45,12 +45,12 @@
      */
     private String userUnit;
 
-    /**
-     * 鏃ユ湡
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date dateInfo;
+    ///**
+    // * 鏃ユ湡
+    // */
+    //@DateTimeFormat(pattern = "yyyy-MM-dd")
+    //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    //private Date dateInfo;
 
     /**
      * 濉啓浜哄鍚�
@@ -134,5 +134,10 @@
             pattern = "yyyy-MM-dd HH:mm:ss"
     )
     private LocalDateTime updatedTime;
+
+    /**
+     * 鏀惰垂鍚堢悊鎬�
+     */
+    private String reasonableCharge;
 }
 

--
Gitblit v1.9.3