From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java
index 34868ab..218784c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbNorspi.java
@@ -43,6 +43,13 @@
private String name;
/**
+ * 数量
+ */
+ @ApiModelProperty(value = "数量")
+ @TableField("\"num\"")
+ private Integer num;
+
+ /**
* 水库编码
*/
@ApiModelProperty(value = "水库编码")
@@ -92,11 +99,25 @@
private Integer workingGateType;
/**
- * 闸门尺寸
+ * 闸门数量
*/
- @ApiModelProperty(value = "闸门尺寸")
- @TableField("\"gate_size\"")
- private String gateSize;
+ @ApiModelProperty(value = "闸门数量")
+ @TableField("\"gate_num\"")
+ private Integer gateNum;
+
+ /**
+ * 闸门长
+ */
+ @ApiModelProperty(value = "闸门长")
+ @TableField("\"gate_length\"")
+ private Double gateLength;
+
+ /**
+ * 闸门宽
+ */
+ @ApiModelProperty(value = "闸门宽")
+ @TableField("\"gate_wide\"")
+ private Double gateWide;
/**
* 最大泄洪流量
@@ -113,6 +134,13 @@
private Integer ocType;
/**
+ * 启闭动力
+ */
+ @ApiModelProperty(value = "启闭动力")
+ @TableField("\"oc_power\"")
+ private String ocPower;
+
+ /**
* 消能方式
*/
@ApiModelProperty(value = "消能方式")
--
Gitblit v1.9.3