From 97c752f75880ff6b799b146ea45fefc2c1d59fa5 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 14 Jun 2023 16:43:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java
index ce40bd7..299f3f9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java
@@ -79,6 +79,12 @@
 	private String tbDamTopElevation;
 
 	/**
+	 * 控制运行水位(米)
+	 */
+	@ApiModelProperty(value = "控制运行水位(米)")
+	private String tbControlZ;
+
+	/**
 	 * 填报前汛期
 	 */
 	private AttResFlseLim xqswObjQ;

--
Gitblit v1.9.3