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/TbAttResRsbNorspi.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 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 218784c..c9dd48e 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
@@ -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,91 +57,91 @@
* 正常溢洪道型式
*/
@ApiModelProperty(value = "正常溢洪道型式")
- @TableField("\"spillway_type\"")
+ @TableField(value = "\"spillway_type\"",fill = FieldFill.UPDATE)
private Integer spillwayType;
/**
* 是否位于坝身
*/
@ApiModelProperty(value = "是否位于坝身")
- @TableField("\"is_loc_dam_body\"")
+ @TableField(value = "\"is_loc_dam_body\"",fill = FieldFill.UPDATE)
private String isLocDamBody;
/**
* 是否有闸控制
*/
@ApiModelProperty(value = "是否有闸控制")
- @TableField("\"is_gate\"")
+ @TableField(value = "\"is_gate\"",fill = FieldFill.UPDATE)
private String isGate;
/**
* 堰顶高程
*/
@ApiModelProperty(value = "堰顶高程")
- @TableField("\"weir_top_elevation\"")
+ @TableField(value = "\"weir_top_elevation\"",fill = FieldFill.UPDATE)
private Double weirTopElevation;
/**
* 堰顶净宽
*/
@ApiModelProperty(value = "堰顶净宽")
- @TableField("\"weir_top_width\"")
+ @TableField(value = "\"weir_top_width\"",fill = FieldFill.UPDATE)
private Double weirTopWidth;
/**
* 工作闸门型式
*/
@ApiModelProperty(value = "工作闸门型式")
- @TableField("\"working_gate_type\"")
+ @TableField(value = "\"working_gate_type\"",fill = FieldFill.UPDATE)
private Integer workingGateType;
/**
* 闸门数量
*/
@ApiModelProperty(value = "闸门数量")
- @TableField("\"gate_num\"")
+ @TableField(value = "\"gate_num\"",fill = FieldFill.UPDATE)
private Integer gateNum;
/**
* 闸门长
*/
@ApiModelProperty(value = "闸门长")
- @TableField("\"gate_length\"")
+ @TableField(value = "\"gate_length\"",fill = FieldFill.UPDATE)
private Double gateLength;
/**
* 闸门宽
*/
@ApiModelProperty(value = "闸门宽")
- @TableField("\"gate_wide\"")
+ @TableField(value = "\"gate_wide\"",fill = FieldFill.UPDATE)
private Double gateWide;
/**
* 最大泄洪流量
*/
@ApiModelProperty(value = "最大泄洪流量")
- @TableField("\"checking_flood_discharge\"")
+ @TableField(value = "\"checking_flood_discharge\"",fill = FieldFill.UPDATE)
private Double checkingFloodDischarge;
/**
* 启闭方式
*/
@ApiModelProperty(value = "启闭方式")
- @TableField("\"oc_type\"")
+ @TableField(value = "\"oc_type\"",fill = FieldFill.UPDATE)
private Integer ocType;
/**
* 启闭动力
*/
@ApiModelProperty(value = "启闭动力")
- @TableField("\"oc_power\"")
+ @TableField(value = "\"oc_power\"",fill = FieldFill.UPDATE)
private String ocPower;
/**
* 消能方式
*/
@ApiModelProperty(value = "消能方式")
- @TableField("\"dis_energy_type\"")
+ @TableField(value = "\"dis_energy_type\"",fill = FieldFill.UPDATE)
private Integer disEnergyType;
/**
--
Gitblit v1.9.3