From a2989e934129341e30d13a649ea01e008a95348f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 27 May 2023 16:16:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java | 35 ++++-------------------------------
1 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java
index f3f0b13..acb1883 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResStagChar.java
@@ -285,11 +285,11 @@
private String floodSeasonAz;
/**
- * 创建时间
+ * 更新人
*/
- @ApiModelProperty(value = "创建时间 ")
- @TableField("\"create_time\"")
- private String createTime;
+ @ApiModelProperty(value = "更新人 ")
+ @TableField("\"update_by\"")
+ private String updateBy;
/**
* 更新时间
@@ -299,34 +299,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
-//
-// /**
-// * 修改人编码
-// */
-// @ApiModelProperty(value = "修改人编码 ")
-// @TableField("\"update_user_code\"")
-// private String updateUserCode;
-//
-// /**
-// * 修改人名称
-// */
-// @ApiModelProperty(value = "修改人名称 ")
-// @TableField("\"update_user_name\"")
-// private String updateUserName;
-//
-// /**
-// * 修改人联系方式
-// */
-// @ApiModelProperty(value = "修改人联系方式 ")
-// @TableField("\"update_user_phone\"")
-// private String updateUserPhone;
-// /**
-// * 采集时间
-// */
-// @ApiModelProperty(value = "采集时间 ")
-// @TableField("\"collect_time\"")
-// private String collectTime;
/**
--
Gitblit v1.9.3