From d186525f28330a2efb560c4eb9358a0730fbfd8b Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 06 Jun 2024 15:50:26 +0800
Subject: [PATCH] 新增字段及查询调整

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/entity/HkStaffGaugeMon.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/entity/HkStaffGaugeMon.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/entity/HkStaffGaugeMon.java
index e6fefe5..1e39089 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/entity/HkStaffGaugeMon.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/entity/HkStaffGaugeMon.java
@@ -2,13 +2,10 @@
 
 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;
 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;
 
@@ -28,6 +25,12 @@
 	 */
 	@TableId(value = "id")
 	private String id;
+
+	/**
+	 * 监测id
+	 */
+	@ApiModelProperty(value = "监测id")
+	private String gaugeMonId;
 
 	/**
 	 * 水尺名称
@@ -68,6 +71,7 @@
 	/**
 	 * 虚拟水尺的坐标
 	 */
+	@ApiModelProperty(value = "虚拟水尺的坐标")
 	private String markData;
 
 	/**
@@ -137,6 +141,15 @@
 	private Date updateTime;
 
 	/**
+	 * 系统创建时间
+	 */
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "系统创建时间")
+	@TableField(value = "sys_create_time",fill = FieldFill.INSERT)
+	private Date sysCreateTime;
+
+	/**
 	 * 删除状态
 	 */
 	@ApiModelProperty(value = "删除状态")

--
Gitblit v1.9.3