From 3e2ae8bd7aefb12f5521e49c3bb5c773ef525cae Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 28 Dec 2023 19:57:59 +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 | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 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 3d98047..a99dd6d 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
@@ -1,7 +1,6 @@
package cn.gistack.sm.sjztmd.entity;
-import com.baomidou.mybatisplus.annotation.TableField;
-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;
@@ -30,8 +29,22 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty(value = "主键")
- @TableField("\"guid\"")
+ @TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
private String guid;
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty(value = "名称")
+ @TableField(value="\"name\"",fill = FieldFill.UPDATE)
+ private String name;
+
+ /**
+ * 数量
+ */
+ @ApiModelProperty(value = "数量")
+ @TableField("\"num\"")
+ private Integer num;
/**
* 水库编码
@@ -44,126 +57,126 @@
* 坝型
*/
@ApiModelProperty(value = "坝型")
- @TableField("\"dam_type\"")
+ @TableField(value="\"dam_type\"",fill = FieldFill.UPDATE)
private String damType;
/**
* 主坝地基岩性
*/
@ApiModelProperty(value = "主坝地基岩性")
- @TableField("\"dam_main_foundation\"")
+ @TableField(value="\"dam_main_foundation\"",fill = FieldFill.UPDATE)
private String damMainFoundation;
/**
* 坝顶高程
*/
@ApiModelProperty(value = "坝顶高程")
- @TableField("\"dam_top_elevation\"")
+ @TableField(value="\"dam_top_elevation\"",fill = FieldFill.UPDATE)
private Double damTopElevation;
/**
* 最大坝高
*/
@ApiModelProperty(value = "最大坝高")
- @TableField("\"dam_height\"")
+ @TableField(value="\"dam_height\"",fill = FieldFill.UPDATE)
private Double damHeight;
/**
* 坝顶长度
*/
@ApiModelProperty(value = "坝顶长度")
- @TableField("\"dam_top_length\"")
+ @TableField(value="\"dam_top_length\"",fill = FieldFill.UPDATE)
private Double damTopLength;
/**
* 坝顶宽度
*/
@ApiModelProperty(value = "坝顶宽度 ")
- @TableField("\"dam_width\"")
+ @TableField(value="\"dam_width\"",fill = FieldFill.UPDATE)
private Double damWidth;
/**
* 主坝是否兼作交通公路
*/
@ApiModelProperty(value = "主坝是否兼作交通公路 ")
- @TableField("\"is_traffic\"")
- private Integer isTraffic;
+ @TableField(value="\"is_traffic\"",fill = FieldFill.UPDATE)
+ private String isTraffic;
/**
* 防浪墙顶高程
*/
@ApiModelProperty(value = "防浪墙顶高程 ")
- @TableField("\"wave_wall_top_elevation\"")
+ @TableField(value="\"wave_wall_top_elevation\"",fill = FieldFill.UPDATE)
private Double waveWallTopElevation;
/**
* 上游护坝型式
*/
@ApiModelProperty(value = "上游护坝型式 ")
- @TableField("\"up_dam_protect_type\"")
- private Integer upDamProtectType;
+ @TableField(value="\"up_dam_protect_type\"",fill = FieldFill.UPDATE)
+ private String upDamProtectType;
/**
* 下游护坝型式
*/
@ApiModelProperty(value = "下游护坝型式 ")
- @TableField("\"down_dam_protect_type\"")
- private Integer downDamProtectType;
+ @TableField(value="\"down_dam_protect_type\"",fill = FieldFill.UPDATE)
+ private String downDamProtectType;
/**
* 主坝坝体防渗型式
*/
@ApiModelProperty(value = "主坝坝体防渗型式 ")
- @TableField("\"dam_main_body_type\"")
- private Integer damMainBodyType;
+ @TableField(value="\"dam_main_body_type\"",fill = FieldFill.UPDATE)
+ private String damMainBodyType;
/**
* 主坝防渗体顶部高程
*/
@ApiModelProperty(value = "主坝防渗体顶部高程 ")
- @TableField("\"dam_main_body_top_elevation\"")
+ @TableField(value="\"dam_main_body_top_elevation\"",fill = FieldFill.UPDATE)
private Double damMainBodyTopElevation;
/**
* 主坝排水形式
*/
@ApiModelProperty(value = "主坝排水形式 ")
- @TableField("\"dam_main_drain_type\"")
- private Integer damMainDrainType;
+ @TableField(value="\"dam_main_drain_type\"",fill = FieldFill.UPDATE)
+ private String damMainDrainType;
/**
* 坝基防渗型式
*/
@ApiModelProperty(value = "坝基防渗型式")
- @TableField("\"dam_body_type\"")
- private Integer damBodyType;
+ @TableField(value="\"dam_body_type\"",fill = FieldFill.UPDATE)
+ private String damBodyType;
/**
* 副坝座数
*/
@ApiModelProperty(value = "副坝座数")
- @TableField("\"sub_dam_num\"")
+ @TableField(value="\"sub_dam_num\"",fill = FieldFill.UPDATE)
private Integer subDamNum;
/**
* 副坝总长度
*/
@ApiModelProperty(value = "副坝总长度")
- @TableField("\"sub_dam_tot_length\"")
+ @TableField(value="\"sub_dam_tot_length\"",fill = FieldFill.UPDATE)
private Double subDamTotLength;
/**
* 副坝最大坝高
*/
@ApiModelProperty(value = "副坝最大坝高")
- @TableField("\"sub_dam_max_height\"")
+ @TableField(value="\"sub_dam_max_height\"",fill = FieldFill.UPDATE)
private Double subDamMaxHeight;
/**
* 副坝坝顶宽度
*/
@ApiModelProperty(value = "副坝坝顶宽度")
- @TableField("\"sub_dam_top_width\"")
+ @TableField(value="\"sub_dam_top_width\"",fill = FieldFill.UPDATE)
private Double subDamTopWidth;
/**
--
Gitblit v1.9.3