From cf119adeab46dcc843c4c7b28a719a0c027d7c88 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 26 Jul 2024 15:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

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

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
index a99dd6d..11d2ad0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java
@@ -155,7 +155,7 @@
 	 * 副坝座数
 	 */
 	@ApiModelProperty(value = "副坝座数")
-	@TableField(value="\"sub_dam_num\"",fill = FieldFill.UPDATE)
+	@TableField(value="\"sub_dam_num\"")
 	private Integer subDamNum;
 
 	/**

--
Gitblit v1.9.3