From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/entity/LaboratoryReagentReserve.java |   70 ++++++++++-------------------------
 1 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/entity/LaboratoryReagentReserve.java b/src/main/java/com/nanometer/smartlab/entity/LaboratoryReagentReserve.java
index e3e346f..b7b1bb2 100644
--- a/src/main/java/com/nanometer/smartlab/entity/LaboratoryReagentReserve.java
+++ b/src/main/java/com/nanometer/smartlab/entity/LaboratoryReagentReserve.java
@@ -1,60 +1,30 @@
 package com.nanometer.smartlab.entity;
 
-import java.io.Serializable;
+import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
 
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Getter
+@Setter
 public class LaboratoryReagentReserve implements Serializable {
-    private String reagentId;
+    private Long id;
+    private Long reagentId;
+    private String articleNumber;
+    private Integer reserve;
+    private Timestamp updateTime;
+    private ValidFlag validFlag;
+    private Long userId;
+    private Long houseId;
+    private Long containerId;
+
+
+    //非数据库字段
     private SysReagent sysReagent;
     private String laboratoryName;
     private String containerName;
-    private Integer reserve;
-    private String id;
 
-    public String getId() {
-        return id;
-    }
 
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getReagentId() {
-        return reagentId;
-    }
-
-    public void setReagentId(String reagentId) {
-        this.reagentId = reagentId;
-    }
-
-    public SysReagent getSysReagent() {
-        return sysReagent;
-    }
-
-    public void setSysReagent(SysReagent sysReagent) {
-        this.sysReagent = sysReagent;
-    }
-
-    public String getLaboratoryName() {
-        return laboratoryName;
-    }
-
-    public void setLaboratoryName(String laboratoryName) {
-        this.laboratoryName = laboratoryName;
-    }
-
-    public String getContainerName() {
-        return containerName;
-    }
-
-    public void setContainerName(String containerName) {
-        this.containerName = containerName;
-    }
-
-    public Integer getReserve() {
-        return reserve;
-    }
-
-    public void setReserve(Integer reserve) {
-        this.reserve = reserve;
-    }
 }

--
Gitblit v1.9.2