From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/article/vo/ArticleVO.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/vo/ArticleVO.java b/src/main/java/org/springblade/modules/article/vo/ArticleVO.java
index 225ece2..d1ddabc 100644
--- a/src/main/java/org/springblade/modules/article/vo/ArticleVO.java
+++ b/src/main/java/org/springblade/modules/article/vo/ArticleVO.java
@@ -69,6 +69,22 @@
 
 	private Integer eventType;
 
-	private List<List<String>> articleList;
+//	private List<List<String>> articleList;
+
+
+	private String houseCode;
+
+	private String districtId;
+
+	private String parentId;
+
+	private List<String> districtIdList;
+
+	// 物业标记
+	private Integer propertyFlag;
+
+	private String streetName;
+
+	private String communityName;
 
 }

--
Gitblit v1.9.3