From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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