From 491df5b1e0bb868f7c7c971445699e67b562a6b3 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 17 Jun 2024 18:58:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
index 96b8c13..db45070 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/IDamSecurityService.java
@@ -39,6 +39,8 @@
 	 */
     List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode);
 
+    List<DamStationStatistics> alarmResCount(DamMonitor damMonitor);
+
 	/**
 	 * 业务一张图大坝安全监测
 	 * @param adCode 行政区划

--
Gitblit v1.9.3