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

xieb

2023-07-12 8aa4448ea65b5ef86689bd15c6b895afc99d17d0

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java

@@ -109,7 +109,7 @@
   @ApiOperation(value = "报汛记录-通过id查询", notes = "报汛记录-通过id查询")
   @GetMapping(value = "/queryById")
   public R queryById(@RequestParam(name = "id", required = true) String id) {
      ReportFloodRecord reportFloodRecord = reportFloodRecordService.getById(id);
      ReportFloodRecordVO reportFloodRecord = reportFloodRecordService.getDetailVO(id);
      return R.data(reportFloodRecord);
   }