Merge remote-tracking branch 'origin/master'

linwe

2024-06-04 1ab597c3027cec9c1a4ba603d18fc1f6870ed865

 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;