Merge remote-tracking branch 'origin/master'

lin

2024-04-15 bdcca1cd1f1c4c5d7d187d74a7c75f1caac8b491

 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;