Merge remote-tracking branch 'origin/master'

lin

2024-03-25 27276ad478ff1e5f2f3b2ce3dac70ec83296fe74

 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;