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/vo/AlarmRecordVO.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 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..3fc3fe3 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,53 @@
* 是否导出
*/
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;
}
--
Gitblit v1.9.3