Merge remote-tracking branch 'origin/master'

lin

2024-05-13 b15f61abc950c4ee94b5ade5f43af97da8465196

 src/main/java/org/springblade/modules/article/vo/ArticleVO.java

@@ -74,6 +74,8 @@

   private String houseCode;

   private Long householdId;

   private String districtId;

   private String parentId;