From 8aa4448ea65b5ef86689bd15c6b895afc99d17d0 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 12 Jul 2023 16:18:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
index 37d50d5..80ec17f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
+++ b/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);
 	}
 

--
Gitblit v1.9.3