From ad7151b14f2721b0fa40a903c6e65a2c511dd4c5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 15:08:13 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27第二次标准库完成修改

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
index 8b543c9..7978c0d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
@@ -11,6 +11,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 
 /**
  * <p>
@@ -23,6 +24,7 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="InspectionProductList瀵硅薄", description="")
+@Accessors(chain = true)
 public class InspectionProductList implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,9 +52,11 @@
     private String internal;
 
     @ApiModelProperty(value = "寮�濮嬫棩鏈�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     @ApiModelProperty(value = "缁撴潫鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     @TableLogic(value = "1", delval = "0")
@@ -72,10 +76,11 @@
     private Integer version;
 
     @ApiModelProperty(value = "鍏宠仈 鎶ユid")
-    private String inspectionId;
+    private int inspectionMaterialListId;
 
     @ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
     private Integer userId;
 
-
+    @ApiModelProperty(value = "鍏宠仈 璁惧id")
+    private Integer instrument_id;
 }

--
Gitblit v1.9.3