From ea5a71d924e0163f2fb7cae00fc390b5068c050b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 31 Oct 2023 10:10:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
index 4991fc1..00fe311 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterDelivery.java
@@ -85,11 +85,18 @@
 	private Double exportElevation;
 
 	/**
-	 * 断面尺寸
+	 * 断面尺寸/面积
 	 */
-	@ApiModelProperty(value = "断面尺寸")
-	@TableField("\"section_size\"")
-	private Double sectionSize;
+	@ApiModelProperty(value = "断面尺寸/面积")
+	@TableField("\"section_wide\"")
+	private Double sectionWide;
+
+	/**
+	 * 断面尺寸/高
+	 */
+	@ApiModelProperty(value = "断面尺寸/高")
+	@TableField("\"section_high\"")
+	private Double sectionHigh;
 
 	/**
 	 * 设计流量

--
Gitblit v1.9.3