From b8e5669a7f8b1e8935920f6b172369a07fae2f26 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 07 Sep 2023 20:12:36 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
index 3371c53..0e4fe09 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java
@@ -114,8 +114,8 @@
*/
@ApiOperation(value = "大坝安全统计-大坝安全监测预警异常统计", notes = "大坝安全统计-大坝安全监测预警异常统计")
@GetMapping(value = "/alarmResCount")
- public R alarmResCount(DamStationStatistics damStationStatistics){
- List<DamStationStatistics> list = damSecurityService.alarmResCount(damStationStatistics);
+ public R alarmResCount(DamStationStatistics damStationStatistics,String basCodes){
+ List<DamStationStatistics> list = damSecurityService.alarmResCount(damStationStatistics,basCodes);
return R.data(list);
}
--
Gitblit v1.9.3