From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigationState.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigationState.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigationState.java
index 46ba1aa..a2c1e8e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigationState.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigationState.java
@@ -55,11 +55,18 @@
@TableField(value = "\"res_guid\"")
private String resGuid;
+ /**
+ * 危害等级
+ */
+ @ApiModelProperty(value = "危害等级")
+ @TableField(value = "\"danger_level\"")
+ private Integer dangerLevel;
+
/**
- * 填报状态（0填报中，1待审核，2已审核）
+ * 填报状态（0 填报中 1 已提交/待校核 2 已校核/待审核 3已审核）
*/
- @ApiModelProperty(value = "填报状态（0填报中，1待审核，2已审核")
+ @ApiModelProperty(value = "0 填报中 1 已提交/待校核 2 已校核/待审核 3已审核")
@TableField("\"check_state\"")
@JsonSerialize(using = ToStringSerializer.class)
private Integer checkState;
@@ -74,9 +81,9 @@
private Date createTime;
/**
- * 纬度
+ * 创建用户
*/
- @ApiModelProperty(value = "纬度")
+ @ApiModelProperty(value = "创建用户")
@TableField(value = "\"create_user\"")
private String createUser;
--
Gitblit v1.9.3