Merge remote-tracking branch 'origin/master'

lin

2024-04-01 02dc776fff0c37a7c9e992fe80f0bdd0528f5e7f

 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;