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/mapper/ReportFloodRecordMapper.java

@@ -19,4 +19,6 @@
   ReportFloodRecordVO customizeGetDetail(@Param("reportFloodRecord") ReportFloodRecordVO reportFloodRecordVO);

    ReportFloodRecord getLatestRecord(@Param("reservoirId") String reservoirId);

   ReportFloodRecordVO getDetailVO(@Param("id") String id);
}