From ea5a71d924e0163f2fb7cae00fc390b5068c050b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 31 Oct 2023 10:10:36 +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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 b427683..b2149ba 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
@@ -160,7 +160,7 @@
/**
* 最终填报状态（总状态）（-1：未填写 0:填写中，1:审核通过）
*/
- @ApiModelProperty(value = "填报状态（-1：未填写 0:填写中，1:审核通过） ")
+ @ApiModelProperty(value = "填报状态（-1：未填写 0:填写中，1:审核通过 2:审核中） ")
@TableField("\"final_state\"")
@JsonSerialize(using = ToStringSerializer.class)
private Integer finalState;
@@ -197,4 +197,11 @@
@TableField("\"log\"")
private String log;
+ /**
+ * 所属行业部门
+ */
+ @ApiModelProperty(value = "所属行业部门 ")
+ @TableField("\"industry_dept\"")
+ private String industryDept;
+
}
--
Gitblit v1.9.3