From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +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/vo/AlarmRecordVO.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java
index 265ac6c..b58231e 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/vo/AlarmRecordVO.java
@@ -11,6 +11,7 @@
@Data
public class AlarmRecordVO extends AlarmRecord {
+
/**
* 区域名称
*/
@@ -45,4 +46,56 @@
* 是否导出
*/
private Integer isExport;
+
+ /**
+ * 开始时间
+ */
+ private String startTime;
+
+ /**
+ * 结束时间
+ */
+ private String endTime;
+
+ /**
+ * 水库规模
+ */
+ private String engScal;
+
+ /**
+ * 水库注册码
+ */
+ private String resRegCode;
+
+ /**
+ * 市州名称
+ */
+ private String cityName;
+
+ /**
+ * 区县
+ */
+ private String countyName;
+
+ /**
+ * 乡镇
+ */
+ private String townName;
+
+ /**
+ * adCode
+ */
+ private String adCode;
+
+ private String adLevel;
+
+ private String alarmLevel;
+
+ private String labels;
+ private String basGuids;
+
+ private String resGuids;
+
+ //测站名称
+ private String cdNm;
}
--
Gitblit v1.9.3