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/TbAttResProjectUtilize.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java
index 0e22fb7..a71e5a6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResProjectUtilize.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;
@@ -46,14 +43,14 @@
* 水库最高水位
*/
@ApiModelProperty(value = "水库最高水位")
- @TableField("\"res_max_stag\"")
+ @TableField(value = "\"res_max_stag\"",fill = FieldFill.UPDATE)
private Double resMaxStag;
/**
* 最高水位发生日期
*/
@ApiModelProperty(value = "最高水位发生日期")
- @TableField("\"res_max_stag_date\"")
+ @TableField(value = "\"res_max_stag_date\"",fill = FieldFill.UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date resMaxStagDate;
@@ -62,14 +59,14 @@
* 水库最低水位
*/
@ApiModelProperty(value = "水库最低水位")
- @TableField("\"res_min_stag\"")
+ @TableField(value = "\"res_min_stag\"",fill = FieldFill.UPDATE)
private Double resMinStag;
/**
* 最低水位发生日期
*/
@ApiModelProperty(value = "最低水位发生日期")
- @TableField("\"res_min_stag_date\"")
+ @TableField(value = "\"res_min_stag_date\"",fill = FieldFill.UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date resMinStagDate;
@@ -78,14 +75,14 @@
* 水库最大入库流量
*/
@ApiModelProperty(value = "水库最大入库流量")
- @TableField("\"res_max_in_flow\"")
+ @TableField(value = "\"res_max_in_flow\"",fill = FieldFill.UPDATE)
private Double resMaxInFlow;
/**
* 水库最大入库流量发生日期
*/
@ApiModelProperty(value = "水库最大入库流量发生日期 ")
- @TableField("\"res_max_in_flow_date\"")
+ @TableField(value = "\"res_max_in_flow_date\"",fill = FieldFill.UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date resMaxInFlowDate;
@@ -94,14 +91,14 @@
* 水库最大出库流量
*/
@ApiModelProperty(value = "水库最大出库流量")
- @TableField("\"res_max_out_flow\"")
+ @TableField(value = "\"res_max_out_flow\"",fill = FieldFill.UPDATE)
private Double resMaxOutFlow;
/**
* 水库最大出库流量发生日期
*/
@ApiModelProperty(value = "水库最大出库流量发生日期 ")
- @TableField("\"res_max_out_flow_date\"")
+ @TableField(value = "\"res_max_out_flow_date\"",fill = FieldFill.UPDATE)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date resMaxOutFlowDate;
--
Gitblit v1.9.3