From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并,网格员区域树查询修改,解决不显示网格问题

---
 src/main/java/org/springblade/modules/subjectChoices/vo/SubjectChoicesVO.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/subjectChoices/vo/SubjectChoicesVO.java b/src/main/java/org/springblade/modules/subjectChoices/vo/SubjectChoicesVO.java
index ac18882..2857dec 100644
--- a/src/main/java/org/springblade/modules/subjectChoices/vo/SubjectChoicesVO.java
+++ b/src/main/java/org/springblade/modules/subjectChoices/vo/SubjectChoicesVO.java
@@ -19,7 +19,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.modules.subjectChoices.entity.SubjectChoicesEntity;
-import org.springblade.modules.subjectOption.entity.SubjectOptionEntity;
+import org.springblade.modules.subjectOption.vo.SubjectOptionVO;
 
 import java.util.List;
 
@@ -34,5 +34,13 @@
 public class SubjectChoicesVO extends SubjectChoicesEntity {
 	private static final long serialVersionUID = 1L;
 
-	private List<SubjectOptionEntity> subjectOptionList;
+	private Long propertyId;
+
+	private Long chooseId;
+
+//	private List<SubjectOptionEntity> subjectOptionList;
+
+	private List<SubjectOptionVO> subjectOptionList;
+
+
 }

--
Gitblit v1.9.3