From 2b8767a3b089e8b69d2dd59795593b096ea699a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 29 八月 2023 17:57:58 +0800
Subject: [PATCH] 8-28 bug修改

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
index d1ab3bb..07e3da7 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Report.java
@@ -20,8 +20,8 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="InspectionReport瀵硅薄", description="")
-@TableName("inspection_report")
+@ApiModel(value="Report瀵硅薄", description="")
+@TableName("report")
 public class Report implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -38,20 +38,27 @@
     @ApiModelProperty(value = "瀹℃牳缁撹")
     private String conclusion;
 
-    @ApiModelProperty(value = "瀹℃牳浜篿d")
-    private Integer userId;
+    @ApiModelProperty(value = "瀹℃牳浜�")
+    private String approver;
 
     @ApiModelProperty(value = "鍏宠仈 鐢宠琛╥d")
     private Integer inspectionId;
 
+    @ApiModelProperty(value = "瀹℃牳鏃堕棿", hidden = true)
+    @JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
+    private Date checkTime;
+
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "鍒涘缓鏃堕棿", hidden = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
     private Date createTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
+    @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝e父>=1,鍒犻櫎<=0", hidden = true)
+    private Integer state;
+
 }
 

--
Gitblit v1.9.3