From 4ddd3e7456b2afe79cccf7c9f5960ea2023231f1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 30 Nov 2023 17:49:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/vo/ArticleVO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 ce099c8..225ece2 100644
--- a/src/main/java/org/springblade/modules/article/vo/ArticleVO.java
+++ b/src/main/java/org/springblade/modules/article/vo/ArticleVO.java
@@ -4,6 +4,7 @@
import org.springblade.modules.article.entity.Article;
import java.io.Serializable;
+import java.util.List;
@Data
public class ArticleVO extends Article implements Serializable {
@@ -64,4 +65,10 @@
private String dictValue;
+ private Integer pdId;
+
+ private Integer eventType;
+
+ private List<List<String>> articleList;
+
}
--
Gitblit v1.9.3