From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java | 57 +++++++++++++++++++++++++--------------------------------
1 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java
index 217af10..d374de6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResInformationProject.java
@@ -43,13 +43,6 @@
private String resGuid;
/**
- * 运行状态
- */
- @ApiModelProperty(value = "运行状态")
- @TableField("\"run_status\"")
- private String runStatus;
-
- /**
* 是否有水雨情测报雨量
*/
@ApiModelProperty(value = "是否有水雨情测报雨量")
@@ -64,18 +57,18 @@
private String isRsvr;
/**
- * 是否有大坝安全监测水平位移
+ * 是否有大坝安全监测位移
*/
- @ApiModelProperty(value = "是否有大坝安全监测水平位移")
+ @ApiModelProperty(value = "是否有大坝安全监测位移")
@TableField("\"is_gnss_horizontal\"")
private String isGnssHorizontal;
-
- /**
- * 是否有大坝安全监测垂直位移
- */
- @ApiModelProperty(value = "是否有大坝安全监测垂直位移")
- @TableField("\"is_gnss_vertical\"")
- private String isGnssVertical;
+//
+// /**
+// * 是否有大坝安全监测垂直位移
+// */
+// @ApiModelProperty(value = "是否有大坝安全监测垂直位移")
+// @TableField("\"is_gnss_vertical\"")
+// private String isGnssVertical;
/**
* 是否有大坝安全监测渗透压力
@@ -107,19 +100,19 @@
private String isTermites;
/**
- * 填报状态（0:填写中，1:审核中，2:审核通过）
+ * 填报状态（0:未完成 2：已完成）
*/
- @ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
+ @ApiModelProperty(value = "填报状态（0:未完成 2：已完成） ")
@TableField("\"check_state\"")
@JsonSerialize(using = ToStringSerializer.class)
private Integer checkState;
-
- /**
- * 审核记录
- */
- @ApiModelProperty(value = "审核记录 ")
- @TableField("\"check_log\"")
- private String checkLog;
+//
+// /**
+// * 审核记录
+// */
+// @ApiModelProperty(value = "审核记录 ")
+// @TableField("\"check_log\"")
+// private String checkLog;
/**
* 创建时间
@@ -129,12 +122,12 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
-
- /**
- * 操作记录
- */
- @ApiModelProperty(value = "操作记录 ")
- @TableField("\"log\"")
- private String log;
+//
+// /**
+// * 操作记录
+// */
+// @ApiModelProperty(value = "操作记录 ")
+// @TableField("\"log\"")
+// private String log;
}
--
Gitblit v1.9.3