From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java b/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
index 17473d0..61d5995 100644
--- a/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
+++ b/src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java
@@ -41,7 +41,7 @@
/** 单号 tid **/
private String tid;
- /** 状态 待解决、已解决、已拒绝 status **/
+ /** 状态 待解决、已确认、已拒绝 status **/
private String status;
/** 创建者 creator **/
@@ -173,12 +173,12 @@
this.tid = tid == null ? null : tid.trim();
}
- /** 状态 待解决、已解决、已拒绝 status **/
+ /** 状态 待解决、已确认、已拒绝 status **/
public String getStatus() {
return status;
}
- /** 状态 待解决、已解决、已拒绝 status **/
+ /** 状态 待解决、已确认、已拒绝 status **/
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
}
--
Gitblit v1.9.2