From 7f3ee212eb210aba3a7da7d2cb4a8d1af2f56116 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 11 Mar 2024 15:40:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/discuss/vo/UserTopicsVO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/vo/UserTopicsVO.java b/src/main/java/org/springblade/modules/discuss/vo/UserTopicsVO.java
index 32a52b2..8cdc501 100644
--- a/src/main/java/org/springblade/modules/discuss/vo/UserTopicsVO.java
+++ b/src/main/java/org/springblade/modules/discuss/vo/UserTopicsVO.java
@@ -16,10 +16,13 @@
  */
 package org.springblade.modules.discuss.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import org.springblade.modules.discuss.entity.UserTopicsEntity;
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
+import java.util.List;
 
 /**
  * 用户议题报表 视图实体类
@@ -41,4 +44,10 @@
 	private String addressName;
 
 	private String aoiName;
+
+	private List<String> aoiCodeList;
+
+	private String districtId;
+
+	private String optionContent;
 }

--
Gitblit v1.9.3