From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportCheckVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java
similarity index 84%
rename from inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportCheckVo.java
rename to inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java
index 60bb95e..7e7ffd1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportCheckVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportAuditingVo.java
@@ -11,7 +11,7 @@
* 鎶ュ憡瀹℃牳
*/
@Data
-public class ReportCheckVo {
+public class ReportAuditingVo {
@ApiModelProperty(value = "鏍峰搧缂栧彿")
@JsonSerialize
private String materialCode;
@@ -28,9 +28,9 @@
@JsonSerialize
private Integer approver;
@ApiModelProperty(value = "鎻愪氦鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date submitTime;
@ApiModelProperty(value = "瀹℃牳鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date checkTime;
}
--
Gitblit v1.9.3