From 7f615dc1f37ccc9efd7f5b2f7e044c2e62f01074 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
index c2f1e79..0f5792f 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/entity/MessageRecord.java
@@ -37,7 +37,7 @@
 	private String content;
 
 	/**
-	 * 状态  已读，未读
+	 * 状态 0未读  1已读
 	 */
 	private Integer status;
 
@@ -46,5 +46,24 @@
 	 */
 	private String source;
 
+	/**
+	 * 水库guid
+	 */
+	private String resGuid;
+
+	/**
+	 * 反馈
+	 */
+	private String feedback;
+
+	/**
+	 * 告警规则id
+	 */
+	private Long alarmRuleId;
+
+	/**
+	 * 告警模板id
+	 */
+	private String templateId;
 
 }

--
Gitblit v1.9.3