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 | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 12c2845..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;//出库流量-其它
+
/**
* 老站监测水位（米）
*/
@@ -57,15 +68,15 @@
private String wlwOverZ;
/**
- * 人工观测水位超汛幅度
+ * 人工观测水位超溢洪道
*/
- @ApiModelProperty("人工观测水位超汛幅度")
+ @ApiModelProperty("人工观测水位超溢洪道")
private String personOverZ;
/**
- * 新站监测水位（米）
+ * 人工监测水位（米）
*/
- @ApiModelProperty("新站监测水位（米）")
+ @ApiModelProperty("人工监测水位（米）")
private String personRz;
/**
@@ -107,7 +118,7 @@
private String taskId;
/**
- * 行政区划
+ * 行政区划(数据库只存了countyCode,没用)
*/
@ApiModelProperty("行政区划")
private String adCode;
--
Gitblit v1.9.3