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-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java
index 7d1d894..ec45272 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallTaskResultVO.java
@@ -1,6 +1,5 @@
 package cn.gistack.sm.intelligentCall.vo;
 
-import cn.gistack.sm.intelligentCall.entity.CallTask;
 import cn.gistack.sm.intelligentCall.entity.CallTaskResult;
 import lombok.Data;
 
@@ -76,6 +75,11 @@
 	 * 所在区县
 	 */
 	private String countyName;
+
+	/**
+	 * 所在乡镇
+	 */
+	private String townName;
 	/**
 	 * 是否巡查责任人 0：未知或空 1：不是巡查责任人 2：是巡查责任人
 	 */
@@ -108,5 +112,14 @@
 	 */
 	private String ids;
 
+	/**
+	 * 是否短信填报反馈
+	 */
+	private String isSmsFill;
+
+	/**
+	 * 是否分页
+	 */
+	private Integer isPage;
 
 }

--
Gitblit v1.9.3