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/SysAlarmPerson.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java b/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java
index 399d601..a2711a8 100644
--- a/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java
+++ b/src/main/java/com/nanometer/smartlab/entity/SysAlarmPerson.java
@@ -21,6 +21,8 @@
private int warningPoint;
+ private String memo;
+
private String refId;
public String getRefId() {
@@ -89,7 +91,15 @@
this.warningPoint = warningPoint;
}
- @Override
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+ @Override
public String toString() {
return "SysAlarm{" +
"id=" + id +
--
Gitblit v1.9.2