From 5bb34860af3a025b136ebf023351bc4ce1e41a4f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 29 Nov 2023 17:56:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
index 25ffaaa..65e3315 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResRsbSpillway.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,77 +57,77 @@
* 洞（孔）身型式
*/
@ApiModelProperty(value = "洞（孔）身型式")
- @TableField("\"spillway_type\"")
+ @TableField(value = "\"spillway_type\"",fill = FieldFill.UPDATE)
private String spillwayType;
/**
* 洞长
*/
@ApiModelProperty(value = "洞长")
- @TableField("\"cove_length\"")
+ @TableField(value = "\"cove_length\"",fill = FieldFill.UPDATE)
private Double coveLength;
/**
* 进口底槛高程
*/
@ApiModelProperty(value = "进口底槛高程")
- @TableField("\"threshold_elevation\"")
+ @TableField(value = "\"threshold_elevation\"",fill = FieldFill.UPDATE)
private Double thresholdElevation;
/**
* 出口底槛高程
*/
@ApiModelProperty(value = "出口底槛高程")
- @TableField("\"export_elevation\"")
+ @TableField(value = "\"export_elevation\"",fill = FieldFill.UPDATE)
private Double exportElevation;
/**
* 断面（孔洞）数量
*/
@ApiModelProperty(value = "断面（孔洞）数量")
- @TableField("\"section_num\"")
+ @TableField(value = "\"section_num\"",fill = FieldFill.UPDATE)
private Integer sectionNum;
/**
* 断面（孔洞）长度
*/
@ApiModelProperty(value = "断面（孔洞）长度")
- @TableField("\"section_length\"")
+ @TableField(value = "\"section_length\"",fill = FieldFill.UPDATE)
private Double sectionLength;
/**
* 断面（孔洞）宽度/直径
*/
@ApiModelProperty(value = "断面（孔洞）宽度/直径")
- @TableField("\"section_wide\"")
+ @TableField(value = "\"section_wide\"",fill = FieldFill.UPDATE)
private Double sectionWide;
/**
* 最大泄洪流量
*/
@ApiModelProperty(value = "最大泄洪流量 ")
- @TableField("\"check_fl_dis_charge\"")
+ @TableField(value = "\"check_fl_dis_charge\"",fill = FieldFill.UPDATE)
private Double checkFlDisCharge;
/**
* 工作闸门型式
*/
@ApiModelProperty(value = "工作闸门型式 ")
- @TableField("\"working_gate_type\"")
+ @TableField(value = "\"working_gate_type\"",fill = FieldFill.UPDATE)
private String workingGateType;
/**
* 启闭方式
*/
@ApiModelProperty(value = "启闭方式 ")
- @TableField("\"oc_type\"")
+ @TableField(value = "\"oc_type\"",fill = FieldFill.UPDATE)
private String ocType;
/**
* 启闭动力
*/
@ApiModelProperty(value = "启闭动力")
- @TableField("\"oc_power\"")
+ @TableField(value = "\"oc_power\"",fill = FieldFill.UPDATE)
private String ocPower;
/**
--
Gitblit v1.9.3