From f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/vo/ArticleVO.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..befe258 100644
--- a/src/main/java/org/springblade/modules/article/vo/ArticleVO.java
+++ b/src/main/java/org/springblade/modules/article/vo/ArticleVO.java
@@ -4,7 +4,6 @@
import org.springblade.modules.article.entity.Article;
import java.io.Serializable;
-import java.util.List;
@Data
public class ArticleVO extends Article implements Serializable {
@@ -69,6 +68,13 @@
private Integer eventType;
- private List<List<String>> articleList;
+// private List<List<String>> articleList;
+
+
+ private String houseCode;
+
+ private String districtId;
+
+ private String parentId;
}
--
Gitblit v1.9.3