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/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/dto/AttResBaseUserDTO.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/dto/AttResBaseUserDTO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/dto/AttResBaseUserDTO.java
index ce887dd..acbce21 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/dto/AttResBaseUserDTO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/dto/AttResBaseUserDTO.java
@@ -185,10 +185,29 @@
 	 */
 	@ApiModelProperty(value = "巡查责任人-职务")
 	private String patrolPosition;
+
 	/**
 	 * 巡查责任人-所属单位
 	 */
 	@ApiModelProperty(value = "巡查责任人-所属单位")
 	private String patrolUnitName;
 
+	/**
+	 * 市州名称
+	 */
+	@ApiModelProperty(value = "市州名称")
+	private String cityName;
+
+	/**
+	 * 区县名称
+	 */
+	@ApiModelProperty(value = "区县名称")
+	private String countyName;
+
+	/**
+	 * 乡镇名称
+	 */
+	@ApiModelProperty(value = "乡镇名称")
+	private String townName;
+
 }

--
Gitblit v1.9.3