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/service/impl/DamSecurityServiceImpl.java

@@ -60,6 +60,11 @@
   }

   @Override
   public List<DamStationStatistics> alarmResCount(DamMonitor damMonitor) {
      return damSecurityMapper.alarmResCountByZt(damMonitor);
   }

   @Override
   public List<DamStatisticsRes> damResInfoCount(String adCode) {

      List<DamStatisticsRes> list = damSecurityMapper.damResInfoCount(adCode);