From dd571bf55de7f9a72d458adc179958ed2f9473c0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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