From cf8e55ddcdfb67f34672fdb6df2b48c094a51c96 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 24 Aug 2023 17:47:07 +0800
Subject: [PATCH] 水库填报部分表数据类型修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResWaterBlock.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 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..7d93859 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,6 +1,8 @@
 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.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,8 +32,15 @@
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)
 	@ApiModelProperty(value = "主键")
-	@TableField("\"guid\"")
+	@TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
 	private String guid;
+
+	/**
+	 * 名称
+	 */
+	@ApiModelProperty(value = "名称")
+	@TableField("\"name\"")
+	private String name;
 
 	/**
 	 * 水库编码
@@ -87,7 +96,7 @@
 	 */
 	@ApiModelProperty(value = "主坝是否兼作交通公路 ")
 	@TableField("\"is_traffic\"")
-	private Integer isTraffic;
+	private String isTraffic;
 
 	/**
 	 * 防浪墙顶高程
@@ -101,21 +110,21 @@
 	 */
 	@ApiModelProperty(value = "上游护坝型式 ")
 	@TableField("\"up_dam_protect_type\"")
-	private Integer upDamProtectType;
+	private String upDamProtectType;
 
 	/**
 	 * 下游护坝型式
 	 */
 	@ApiModelProperty(value = "下游护坝型式 ")
 	@TableField("\"down_dam_protect_type\"")
-	private Integer downDamProtectType;
+	private String downDamProtectType;
 
 	/**
 	 * 主坝坝体防渗型式
 	 */
 	@ApiModelProperty(value = "主坝坝体防渗型式 ")
 	@TableField("\"dam_main_body_type\"")
-	private Integer damMainBodyType;
+	private String damMainBodyType;
 
 	/**
 	 * 主坝防渗体顶部高程
@@ -129,7 +138,7 @@
 	 */
 	@ApiModelProperty(value = "主坝排水形式 ")
 	@TableField("\"dam_main_drain_type\"")
-	private Integer damMainDrainType;
+	private String damMainDrainType;
 
 	/**
 	 * 坝基防渗型式

--
Gitblit v1.9.3