From b6a42ed2c7bb93651a9a026afb3ee83449ed8256 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 11 Sep 2023 09:29:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java
index ed7111a..b427683 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbAttResBase.java
@@ -158,10 +158,10 @@
private Date waterStorageTm;
/**
- * 最终填报状态（总状态）（0:填写中，1:审核中，2:审核通过）
+ * 最终填报状态（总状态）（-1：未填写 0:填写中，1:审核通过）
*/
- @ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ")
- @TableField("\"check_state\"")
+ @ApiModelProperty(value = "填报状态（-1：未填写 0:填写中，1:审核通过） ")
+ @TableField("\"final_state\"")
@JsonSerialize(using = ToStringSerializer.class)
private Integer finalState;
--
Gitblit v1.9.3