Merge remote-tracking branch 'origin/master'

lin

2024-04-02 a977cf7f73fabaf610c39ce744f8891ec5cf473c

 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;