From 7d44d7a2a9ee8f55e911d678d78ff25f047cab4d Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Mon, 24 Jun 2024 12:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
index 560ee04..c65fa85 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/entity/ReportFloodRecord.java
@@ -32,6 +32,17 @@
 	@ApiModelProperty("今日降雨(毫米)")
 	private String curDrp;
 
+	private String daysw;//当日水位
+
+	private String daykr;//当日库容
+
+	private String rkll;//入库流量
+
+	private String ckllgg;//出库流量-灌溉
+	private String ckllfd;//出库流量-发电
+	private String ckllxth;//出库流量-泄调洪
+	private String ckllqt;//出库流量-其它
+
 	/**
 	 * 老站监测水位(米)
 	 */

--
Gitblit v1.9.3