From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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..8afabf1 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")
@@ -71,11 +75,12 @@
private Integer version;
- @ApiModelProperty(value = "鍏宠仈 鎶ユid")
- private String inspectionId;
+ @ApiModelProperty(value = "鍏宠仈 鎶ユ鐗╂枡id")
+ private int inspectionMaterialListId;
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
private Integer userId;
-
+ @ApiModelProperty(value = "鍏宠仈 璁惧id")
+ private Integer instrumentId;
}
--
Gitblit v1.9.3