Merge remote-tracking branch 'origin/jtdev' into jtdev

shenyijian

2024-06-17 491df5b1e0bb868f7c7c971445699e67b562a6b3

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java

@@ -26,6 +26,8 @@

   List<DamStationStatistics> alarmResCount(@Param("dam") DamStationStatistics damStationStatistics,@Param("basCodes") String basCodes);

   List<DamStationStatistics> alarmResCountByZt(@Param("dam") DamMonitor damMonitor);

    List<DamStatisticsRes> damResInfoCount(@Param("adCode") String adCode);

   List<DamStationStatistics> getResErrorList(@Param("dam") DamStatisticsRes damStatisticsRes, @Param("adCode") String adCode);