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

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbVerspi.java |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbVerspi.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbVerspi.java
index 150960b..dadaefc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbVerspi.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbVerspi.java
@@ -1,9 +1,6 @@
 package cn.gistack.sm.sjztmd.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -39,14 +36,14 @@
 	 * 名称
 	 */
 	@ApiModelProperty(value = "名称")
-	@TableField("\"name\"")
+	@TableField(value = "\"name\"",fill = FieldFill.UPDATE)
 	private String name;
 
 	/**
 	 * 数量
 	 */
 	@ApiModelProperty(value = "数量")
-	@TableField("\"num\"")
+	@TableField(value = "\"num\"",fill = FieldFill.UPDATE)
 	private Integer num;
 
 	/**
@@ -60,28 +57,28 @@
 	 * 非常溢洪道型式
 	 */
 	@ApiModelProperty(value = "非常溢洪道型式")
-	@TableField("\"spillway_type\"")
+	@TableField(value = "\"spillway_type\"",fill = FieldFill.UPDATE)
 	private Integer spillwayType;
 
 	/**
 	 * 溢流段长
 	 */
 	@ApiModelProperty(value = "溢流段长")
-	@TableField("\"weir_top_width\"")
+	@TableField(value = "\"weir_top_width\"",fill = FieldFill.UPDATE)
 	private Double weirTopWidth;
 
 	/**
 	 * 启用标准
 	 */
 	@ApiModelProperty(value = "启用标准")
-	@TableField("\"enable_standards\"")
+	@TableField(value = "\"enable_standards\"",fill = FieldFill.UPDATE)
 	private String enableStandards;
 
 	/**
 	 * 最大泄洪流量
 	 */
 	@ApiModelProperty(value = "最大泄洪流量")
-	@TableField("\"checking_flood_discharge\"")
+	@TableField(value = "\"checking_flood_discharge\"",fill = FieldFill.UPDATE)
 	private Double checkingFloodDischarge;
 
 	/**

--
Gitblit v1.9.3