From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
index 58d6743..08fdc5c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/AttResBase.java
@@ -2,13 +2,16 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
/**
* 中台水库实体类
@@ -16,7 +19,7 @@
* @author Chill
*/
@Data
-@TableName("\"tb_res_base\"")
+@TableName("\"att_res_base\"")
@ApiModel(value = "水库对象", description = "水库对象")
public class AttResBase implements Serializable {
private static final long serialVersionUID = 1L;
@@ -63,6 +66,13 @@
@ApiModelProperty(value = "注册登记码")
@TableField("\"res_reg_code\"")
private String resRegCode;
+
+ /**
+ * 注册登记码
+ */
+ @ApiModelProperty(value = "标签")
+ @TableField("\"label\"")
+ private String label;
//
// /**
// * 其他行业注册号
@@ -183,12 +193,12 @@
// @TableField("\"mgr_ad_guid\"")
// private String mgrAdGuid;
//
-// /**
-// * 内部行政区划guid
-// */
-// @ApiModelProperty(value = "内部行政区划guid ")
-// @TableField("\"interior_ad_guid\"")
-// private String interiorAdGuid;
+ /**
+ * 内部行政区划guid
+ */
+ @ApiModelProperty(value = "内部行政区划guid ")
+ @TableField("\"interior_ad_guid\"")
+ private String interiorAdGuid;
//
/**
* 水库所在位置
@@ -309,12 +319,14 @@
// @TableField("\"create_time\"")
// private String createTime;
//
-// /**
-// * 更新时间
-// */
-// @ApiModelProperty(value = "更新时间 ")
-// @TableField("\"update_time\"")
-// private String updateTime;
+ /**
+ * 更新时间
+ */
+ @ApiModelProperty(value = "更新时间 ")
+ @TableField("\"update_time\"")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
//
// /**
// * 采集时间
--
Gitblit v1.9.3