From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java
index 304e579..177584f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java
@@ -16,7 +16,7 @@
*/
public static List<String> waterInfoNotList = new ArrayList<String>()
{{
- add("county_nm,town_nm");
+// add("county_nm,town_nm");
add("res_nm");
}};
@@ -25,7 +25,7 @@
*/
public static List<String> waterDataExcList = new ArrayList<String>()
{{
- add("county_nm,town_nm");
+// add("county_nm,town_nm");
add("res_nm");
// add("rz");
}};
@@ -223,4 +223,13 @@
add("rz");
}};
+ /**
+ * 19.坝安全监测告警
+ */
+ public static List<String> damSafetyList = new ArrayList<String>()
+ {{
+// add("county_nm,town_nm");
+ add("res_nm");
+ add("ms_flag");
+ }};
}
--
Gitblit v1.9.3