From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/discuss/vo/UserTopicsVO.java |   18 ++++++++++++++++++
 1 files changed, 18 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 3aab930..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;
 
 /**
  * 用户议题报表 视图实体类
@@ -32,4 +35,19 @@
 public class UserTopicsVO extends UserTopicsEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String avatar;
+
+	private String name;
+
+	private String phone;
+
+	private String addressName;
+
+	private String aoiName;
+
+	private List<String> aoiCodeList;
+
+	private String districtId;
+
+	private String optionContent;
 }

--
Gitblit v1.9.3