From f7d2f20365467a834188edd35c464d9fb9349214 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:53:43 +0800
Subject: [PATCH] 安全物资和设备管理调整v2
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfo.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfo.java
index 47c026d..1329793 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialDetailInfo.java
@@ -5,6 +5,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
@TableName("safe_material_detail")
public class SafeMaterialDetailInfo implements Serializable {
@@ -46,7 +47,7 @@
/**
* 保质到期时间
*/
- private LocalDateTime validTime;
+ private Date validTime;
/**
* 状态
*/
@@ -70,13 +71,21 @@
/**
* 认领人id
*/
- private Long claimantId;
+ private Long receiveUid;
/**
* 认领人姓名
*/
- private String claimantName;
+ private String receiveUname;
+ /**
+ * 无效原因
+ */
+ private Byte status;
+ /**
+ * 描述
+ */
+ private String remark;
/**
* 删除标识
*/
@@ -179,11 +188,11 @@
this.validType = validType;
}
- public LocalDateTime getValidTime() {
+ public Date getValidTime() {
return validTime;
}
- public void setValidTime(LocalDateTime validTime) {
+ public void setValidTime(Date validTime) {
this.validTime = validTime;
}
@@ -283,19 +292,36 @@
this.updateTime = updateTime;
}
- public Long getClaimantId() {
- return claimantId;
+ public Long getReceiveUid() {
+ return receiveUid;
}
- public void setClaimantId(Long claimantId) {
- this.claimantId = claimantId;
+ public void setReceiveUid(Long receiveUid) {
+ this.receiveUid = receiveUid;
}
- public String getClaimantName() {
- return claimantName;
+ public String getReceiveUname() {
+ return receiveUname;
}
- public void setClaimantName(String claimantName) {
- this.claimantName = claimantName;
+ public void setReceiveUname(String receiveUname) {
+ this.receiveUname = receiveUname;
+ }
+
+
+ public Byte getStatus() {
+ return status;
+ }
+
+ public void setStatus(Byte status) {
+ this.status = status;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
}
}
--
Gitblit v1.9.2