Merge remote-tracking branch 'origin/master'

lin

2024-04-10 d3c223eaa4df46d17c138ef8ed5eab8da9638416

 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;


}