Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

zhongrj

2023-09-07 b8e5669a7f8b1e8935920f6b172369a07fae2f26

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

@@ -19,7 +19,7 @@

   List<DamStationStatistics> tableResCountPage(@Param("dam")DamStationStatistics damStationStatistics, IPage<DamStationStatistics> page);

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

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