From 0a62550520293dacf31c4cf0dd58735db066e2dd Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java | 45 +++++++++++----------------------------------
1 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
index e37a342..5c1f45f 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/Inspection.java
@@ -10,8 +10,10 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
/**
@@ -24,6 +26,8 @@
*/
@Data
@Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="Inspection瀵硅薄", description="")
public class Inspection implements Serializable {
@@ -69,38 +73,11 @@
@ApiModelProperty(value = "妫�楠岀粨鏉熸棩鏈�")
private LocalDateTime inspectEndTime;
- @ApiModelProperty(value = "鎶ユ鏁伴噺-鐗╂枡鏁伴噺")
- private Integer materialNum;
-
- @ApiModelProperty(value = "渚涘簲鍟�")
- private String materialSupplier;
-
- @ApiModelProperty(value = "鐗╂枡鍚嶇О")
- private String materialName;
-
- @ApiModelProperty(value = "鐗╂枡瀛樻斁鍦�")
- private String materialLocation;
-
- @ApiModelProperty(value = "鐗╂枡鎵规")
- private String materialBatch;
-
- @ApiModelProperty(value = "鐗╂枡鐩樺彿")
- private String materialReelNumber;
-
- @ApiModelProperty(value = "瑙勬牸鍚嶇О/鍨嬪彿鍚嶇О")
- private String specificationsSerialNumber;
-
- @ApiModelProperty(value = "鐢靛帇绛夌骇")
- private String specificationsVoltageLevel;
-
- @ApiModelProperty(value = "涓荤嚎蹇冩埅闈�")
- private String specificationsCrossSection;
-
- @ApiModelProperty(value = "涓荤嚎鑺姱鏁�")
- private String specificationsNumberOfCores;
-
- @ApiModelProperty(value = "鐢熶骇鎸囦护鍙�")
- private String specificationsInstruct;
-
-
+ public Inspection(Integer type, Integer inspectionStatus, Integer state, Integer version, String userName) {
+ this.type = type;
+ this.inspectionStatus = inspectionStatus;
+ this.state = state;
+ this.version = version;
+ this.userName = userName;
+ }
}
--
Gitblit v1.9.3