From 41c8dd06fe3218e54314a58544d7cefe732fbdfb Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 22 Apr 2024 16:52:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecord.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecord.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecord.java
index 57b851e..3cbcdfe 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecord.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRecord.java
@@ -14,11 +14,6 @@
public class AlarmRecord extends BaseEntity {
/**
- * 测站名称
- */
- private String alarmSurveyStationName;
-
- /**
* 测站类型
*/
private String surveyStationType;
@@ -49,7 +44,14 @@
private String alarmSurveyStationCode;
/**
- * 测站新旧
+ * 临时编号-每次任务执行都不一样
*/
- private String alarmSurveyStationNewOld;
+ private String tempCode;
+
+ /**
+ * 任务id
+ */
+ private String taskId;
+
+ private String monitorData;
}
--
Gitblit v1.9.3