From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/article/vo/ArticleVO.java |   15 ++++++++++++++-
 1 files changed, 14 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 894329a..1f4e110 100644
--- a/src/main/java/org/springblade/modules/article/vo/ArticleVO.java
+++ b/src/main/java/org/springblade/modules/article/vo/ArticleVO.java
@@ -69,11 +69,24 @@
 
 	private Integer eventType;
 
-	private List<List<String>> articleList;
+//	private List<List<String>> articleList;
 
 
 	private String houseCode;
 
+	private Long householdId;
+
 	private String districtId;
 
+	private String parentId;
+
+	private List<String> districtIdList;
+
+	// 物业标记
+	private Integer propertyFlag;
+
+	private String streetName;
+
+	private String communityName;
+
 }

--
Gitblit v1.9.3