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/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);
   }