Merge remote-tracking branch 'origin/master'

zhongrj

2024-03-16 8ab807d8579622ec72545902d67cc7025c88f596

 src/main/java/org/springblade/modules/subjectChoices/vo/SubjectChoicesVO.java

@@ -36,6 +36,8 @@

   private Long propertyId;

   private Long chooseId;

//   private List<SubjectOptionEntity> subjectOptionList;

   private List<SubjectOptionVO> subjectOptionList;