From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev

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

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java
index 5e4e878..32d9476 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResWaterBlock.java
@@ -45,8 +45,8 @@
 	 * 填报坝顶高程(米)
 	 */
 	@ApiModelProperty(value = "填报坝顶高程(米)")
-	@TableField("\"top_dam_top_elevation\"")
-	private String topDamTopElevation;
+	@TableField("\"tb_dam_top_elevation\"")
+	private String tbDamTopElevation;
 
 	/**
 	 * 更新时间
@@ -57,4 +57,11 @@
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 
+	/**
+	 * 更新人
+	 */
+	@ApiModelProperty(value = "更新人 ")
+	@TableField("\"update_by\"")
+	private String updateBy;
+
 }

--
Gitblit v1.9.3