From 82fbcce60ae86965441ae045df1f864d10005d35 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 21 八月 2023 17:59:46 +0800
Subject: [PATCH] 检验计划

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
index 9c7849e..478437d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
@@ -1,32 +1,54 @@
 package com.yuanchu.limslaboratory.pojo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 
 /**
  * 妫�楠屾姤鍛�
  */
 @Data
 public class ReportVo {
+
+    @ApiModelProperty(value = "妫�楠屾姤鍛奿d")
+    @JsonSerialize
+    private Integer id;
+
     @ApiModelProperty(value = "鏍峰搧缂栧彿")
     @JsonSerialize
     private String materialCode;
+
     @ApiModelProperty(value = "鎶ュ憡鍗曞彿")
     @JsonSerialize
     private String reportCode;
-    @ApiModelProperty(value = "鐢宠鍗曞彿")
+
+    @ApiModelProperty(value = "妫�楠岀敵璇峰崟鍙�")
     @JsonSerialize
     private String inspectionCode;
-    @ApiModelProperty(value = "瀹℃壒浜�")
+
+    @ApiModelProperty(value = "鏍峰搧鍚嶇О")
     @JsonSerialize
-    private Integer approver;
-    @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡瀹℃牳")
-    @JsonSerialize
-    private Integer status;
+    private String materialName;
+
     @ApiModelProperty(value = "妫�楠岀粨璁�")
     @JsonSerialize
     private String conclusion;
+
+    @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡閫氳繃 3:涓嶉�氳繃")
+    @JsonSerialize
+    private Integer status;
+
+    @ApiModelProperty(value = "瀹℃壒浜�")
+    @JsonSerialize
+    private Integer approver;
+
+    @ApiModelProperty(value = "瀹℃牳鏃堕棿", hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
+    private Date checkTime;
+
     @ApiModelProperty(value = "缂栧埗浜�")
     @JsonSerialize
     private String name;

--
Gitblit v1.9.3