From d587001b15cf77392ebe5fd439c31d0478d006b6 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 20 May 2024 17:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
index d53edf6..6df1848 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/vo/HkVO.java
@@ -141,11 +141,16 @@
 	private String expand;
 
 	/**
-	 * 水库/区域名称
+	 * 水库/区域名称(区县)
 	 */
 	private String regionName;
 
 	/**
+	 * 地市名称
+	 */
+	private String cityName;
+
+	/**
 	 * 水库/区域编号
 	 */
 	private String regionIndexCode;

--
Gitblit v1.9.3