Merge remote-tracking branch 'origin/master'

zhongrj

2024-04-12 dbe7fe4662e9fd130869f0c5e7ee218f62740b72

 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;