From 8aa4448ea65b5ef86689bd15c6b895afc99d17d0 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 12 Jul 2023 16:18:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java
index c4edceb..7995192 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolRecord.java
@@ -75,4 +75,16 @@
 	 */
 	private String solution;
 
+
+	/**
+	 * 处理状态(1、已解决,2、未解决)
+	 */
+	@ApiModelProperty("处理状态(1、已解决,2、未解决)")
+	private String state;
+
+	/**
+	 * 工作流任务id
+	 */
+	@ApiModelProperty("工作流任务id")
+	private String flowTaskId;
 }

--
Gitblit v1.9.3